Merge branch 'v2.3.1' into 'dev'

非讨论区热门擦除顶置状态

See merge request !86

community-api/src/main/java/com/tanpu/community/api/beans/qo/ThemeQo.java

@@ -138,4 +138,8 @@ public class ThemeQo implements Serializable {
     // 使用关键词搜索时，在列表页展示的简要内容，内容带关键字.
     public String briefContent4FullSearch;
 
+    public void evictTop() {
+        this.isTop = 0;
+    }
+
 }

community-service/src/main/java/com/tanpu/community/manager/ThemeManager.java

@@ -546,9 +546,9 @@ public class ThemeManager {
             themes = themeService.queryByThemeIds(rankThemeIds);
             themes = RankUtils.sortThemeEntityByIds(themes, rankThemeIds);
             // 置顶
-            if (pageStart==0){
+            if (pageStart == 0) {
                 topThemes.addAll(themes);
-                themes=topThemes;
+                themes = topThemes;
             }
 
         } else if (ThemeListTypeEnum.TOPIC_LATEST.getCode().equals(req.getType())) {
@@ -566,12 +566,17 @@ public class ThemeManager {
         // todo 测试性能
         commentService.queryRecentComments(resp.themes);
 
-        // 讨论区添加是否管理员，是否顶置
+        // 讨论区添加是否管理员
         if (ThemeListTypeEnum.TOPIC_LATEST.getCode().equals(req.getType())
                 || ThemeListTypeEnum.TOPIC_HOT.getCode().equals(req.getType())) {
             topicService.checkManager(req.getTopicId(), resp.themes);
         }
 
+        // 非讨论区热门擦除顶置状态
+        if (!ThemeListTypeEnum.TOPIC_HOT.getCode().equals(req.getType())) {
+            resp.themes.stream().forEach(ThemeQo::evictTop);
+        }
+
         // 保存缓存、记录已浏览
         excludeIds.addAll(resp.themes.stream().map(ThemeQo::getThemeId).collect(Collectors.toList()));
         redisCache.put("queryThemes_" + req.ident, excludeIds, 60 * 60 * 6);