Commit 1ddfaf2d authored by 刘基明's avatar 刘基明

缓存修复

parent 345b5acc
...@@ -462,12 +462,7 @@ public class ThemeManager { ...@@ -462,12 +462,7 @@ public class ThemeManager {
.build(); .build();
//原主题包装到FormerThemeQo中 //原主题包装到FormerThemeQo中
ThemeQo themeQo = themeMap.get(themeId); ThemeQo themeQo = themeMap.get(themeId);
//如果原文被删除,跳过
if (themeQo==null){
continue;
}
FormerThemeQo f = ConvertUtil.themeQo2FormerThemeQo(themeQo);
//ThemeContentQo和原主题包装到FormerThemeQo中包装到ThemeQo中
ThemeQo commentThemeQo = ThemeQo.builder() ThemeQo commentThemeQo = ThemeQo.builder()
.authorId(userInfo.getUserId()) .authorId(userInfo.getUserId())
.nickName(userInfo.getNickName()) .nickName(userInfo.getNickName())
...@@ -477,13 +472,16 @@ public class ThemeManager { ...@@ -477,13 +472,16 @@ public class ThemeManager {
.userInvestorType(userInfo.getUserInvestorType()) .userInvestorType(userInfo.getUserInvestorType())
.belongUserOrgId(userInfo.getBelongUserOrgId()) .belongUserOrgId(userInfo.getBelongUserOrgId())
.belongUserOrgName(userInfo.getBelongUserOrgName()) .belongUserOrgName(userInfo.getBelongUserOrgName())
.content(Arrays.asList(commentContent)) .content(Collections.singletonList(commentContent))
.formerTheme(f)
.commentId(commentEntity.getCommentId()) .commentId(commentEntity.getCommentId())
.themeType(ThemeTypeEnum.RES_COMMENT.getCode()) .themeType(ThemeTypeEnum.RES_COMMENT.getCode())
.follow(followRelService.checkFollow(themeQo.getAuthorId(),userId)) .follow(followRelService.checkFollow(themeQo.getAuthorId(),userId))
.build(); .build();
//如果原文未被删除,组装数据到formerTheme中
if (themeQo!=null){
FormerThemeQo f = ConvertUtil.themeQo2FormerThemeQo(themeQo);
themeQo.setFormerTheme(f);
}
commentThemeList.add(commentThemeQo); commentThemeList.add(commentThemeQo);
} }
return commentThemeList; return commentThemeList;
......
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