From e179d8660bf4837455a38c24e74320143e0d2e17 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 23 一月 2019 16:05:28 +0800
Subject: [PATCH] 首页的邀请控制
---
fanli/src/main/java/com/yeshi/fanli/controller/client/UserMsgController.java | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/UserMsgController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/UserMsgController.java
index ab6a113..5e0f2c0 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/UserMsgController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/UserMsgController.java
@@ -195,7 +195,7 @@
try {
UserSettingsVO vo = userCustomSettingsService.getMySettings(uid);
- if (vo != null && vo.getNoNewsRedDot() == 1) {
+ if (vo != null && vo.getNoNewsRedDot() != null && vo.getNoNewsRedDot() == 1) {
data.put("totalCount", 0);
}
} catch (UserCustomSettingsException e) {
@@ -414,8 +414,7 @@
UserSystemMsg usm = userSystemMsgService.getLatestUserSystemMsg(uid);
if (usm != null)
root.put("systemMsg",
- new UserSystemMsgVO(usm.getId(), usm.getType().name(), usm.getSolved(), "绯荤粺娑堟伅",
- usm.getTitle(),
+ new UserSystemMsgVO(usm.getId(), usm.getType().name(), usm.getSolved(), "绯荤粺娑堟伅", usm.getTitle(),
usm.getTimeTag() == 1 ? "http://img.flqapp.com/resource/msg/icon_emergent.png" : "",
"http://img.flqapp.com/resource/msg/icon_msg_system.png",
getTimeDesc(now, usm.getCreateTime()), num.getTypeSystem()));
--
Gitblit v1.8.0