Merge branch 'v2.3.1' into 'dev'

帖子列表过滤删除评论

See merge request !85

community-service/src/main/java/com/tanpu/community/service/CommentService.java

@@ -72,11 +72,13 @@ public class CommentService {
                 .eq(CommentEntity::getThemeId, themeId))
                 .eq(CommentEntity::getDeleteTag, DeleteTagEnum.NOT_DELETED));
     }
+
     public Integer getCommentCountByThemeIds(List<String> themeIds) {
         return commentMapper.selectCount((new LambdaQueryWrapper<CommentEntity>()
                 .in(CommentEntity::getThemeId, themeIds))
                 .eq(CommentEntity::getDeleteTag, DeleteTagEnum.NOT_DELETED));
     }
+
     public Integer getCommentCountByThemeIds(List<String> themeIds, Date startDate, Date endDate) {
         return commentMapper.selectCount((new LambdaQueryWrapper<CommentEntity>()
                 .in(CommentEntity::getThemeId, themeIds))
@@ -204,6 +206,7 @@ public class CommentService {
 
         List<CommentEntity> commentEntities = commentMapper.selectList(new LambdaQueryWrapper<CommentEntity>()
                 .in(CommentEntity::getThemeId, themeIds)
+                .eq(CommentEntity::getDeleteTag, DeleteTagEnum.NOT_DELETED.getCode())
                 .orderByDesc(CommentEntity::getCreateTime));
 
         LinkedHashMap<String, List<CommentEntity>> collect = commentEntities.stream().collect(Collectors.groupingBy(CommentEntity::getThemeId, LinkedHashMap::new, Collectors.toList()));
@@ -215,7 +218,7 @@ public class CommentService {
         for (ThemeQo theme : themes) {
             if (collect.containsKey(theme.getThemeId())) {
                 List<CommentEntity> comments = collect.get(theme.getThemeId());
-                theme.setRecentComments(ConvertUtil.comment2Simple(comments.subList(0,Math.min(comments.size(),3)), nameMap));
+                theme.setRecentComments(ConvertUtil.comment2Simple(comments.subList(0, Math.min(comments.size(), 3)), nameMap));
             }
         }