Commit 54647c2d authored by 刘基明's avatar 刘基明

消息通知添加话题信息 fix

parent 0f31bc4b
...@@ -92,12 +92,13 @@ public class NotificationManager { ...@@ -92,12 +92,13 @@ public class NotificationManager {
themeNotifyQo.setUserInvestorType(userInfo.getUserInvestorType()); themeNotifyQo.setUserInvestorType(userInfo.getUserInvestorType());
themeNotifyQo.setBelongUserOrgId(userInfo.getBelongUserOrgId()); themeNotifyQo.setBelongUserOrgId(userInfo.getBelongUserOrgId());
themeNotifyQo.setBelongUserOrgName(userInfo.getBelongUserOrgName()); themeNotifyQo.setBelongUserOrgName(userInfo.getBelongUserOrgName());
// 封装转发对象 // 封装引用对象
if (StringUtils.isNotEmpty(themeNotifyQo.getFormerThemeId())) { if (StringUtils.isNotEmpty(themeNotifyQo.getFormerThemeId())) {
ThemeEntity former = themeService.queryByThemeId(themeNotifyQo.getFormerThemeId()); ThemeEntity former = themeService.queryByThemeId(themeNotifyQo.getFormerThemeId());
if (former != null) { if (former != null) {
themeNotifyQo.setFormerUserName(currentUser.getNickName()); themeNotifyQo.setFormerUserName(currentUser.getNickName());
if (StringUtils.isNotBlank(former.getTopicId())){ if (StringUtils.isNotBlank(former.getTopicId())){
// 内部话题
themeNotifyQo.setFormerTopicId(former.getTopicId()); themeNotifyQo.setFormerTopicId(former.getTopicId());
themeNotifyQo.setFormerTopicTitle(topicService.queryTitleById(former.getTopicId())); themeNotifyQo.setFormerTopicTitle(topicService.queryTitleById(former.getTopicId()));
} }
...@@ -111,9 +112,9 @@ public class NotificationManager { ...@@ -111,9 +112,9 @@ public class NotificationManager {
} }
} }
} }
// 话题 // 外部话题
if (StringUtils.isNotBlank(themeNotifyQo.getTopicId())) { if (StringUtils.isNotBlank(themeNotifyQo.getTopicId())) {
themeNotifyQo.setFormerTopicTitle(topicService.queryTitleById(themeNotifyQo.getTopicId())); themeNotifyQo.setTopicTitle(topicService.queryTitleById(themeNotifyQo.getTopicId()));
} }
// 点赞聚合 // 点赞聚合
if (themeNotifyQo.getLikeUserCount()!=null && themeNotifyQo.getLikeUserCount()>1) { if (themeNotifyQo.getLikeUserCount()!=null && themeNotifyQo.getLikeUserCount()>1) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment