Merge branch 'v2.3.1' into 'dev'

话题评论数过滤删除主题

See merge request !107

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

@@ -197,13 +197,15 @@ public class ThemeService {
         return themeMapper.selectList(queryWrapper);
     }
 
-    //根据话题查询所有的主题Id,包括已删除的主题
+    // 根据话题查询所有的主题Id,
+    // 不包括已删除的主题 v2.3.1
     public List<String> queryThemeIdsByTopic(String topidId) {
         if (StringUtils.isEmpty(topidId)) {
             return Collections.emptyList();
         }
         LambdaQueryWrapper<ThemeEntity> queryWrapper = new LambdaQueryWrapper<ThemeEntity>()
-                .eq(ThemeEntity::getTopicId, topidId);
+                .eq(ThemeEntity::getTopicId, topidId)
+                .eq(ThemeEntity::getDeleteTag,DeleteTagEnum.NOT_DELETED);
         queryWrapper.select(ThemeEntity::getThemeId);
         return themeMapper.selectList(queryWrapper).stream().map(ThemeEntity::getThemeId).collect(Collectors.toList());
     }