From a5b74cb17159f71dac98b3e7ae81e43fce73a3f9 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 01 三月 2019 14:15:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/client/UserInfoController.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/UserInfoController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/UserInfoController.java
index ac96ba1..d4bf15b 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/UserInfoController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/UserInfoController.java
@@ -593,12 +593,14 @@
data.put("moduleState", mySettings);
+ int welfareCenterNews = 0;
UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(user.getId());
- if (userInfoExtra == null) {
- data.put("welfareCenterNews", 0);
- } else {
- data.put("welfareCenterNews", userInfoExtra.getCouponNews());
+ if (userInfoExtra != null && userInfoExtra.getCouponNews() != null) {
+ welfareCenterNews = userInfoExtra.getCouponNews();
}
+ data.put("welfareCenterNews", welfareCenterNews);
+
+
out.print(JsonUtil.loadTrueResult(data));
--
Gitblit v1.8.0