推荐列表 fix

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

@@ -430,8 +430,9 @@ public class ThemeManager {
             List<String> recmdIds = recommendService.getRecommendThemes(pageStart, pageSize, userId, excludes, firstThemeTime);
 
             // 加载第一页时，为防止首页显示空列表,从推荐池中再捞出已看过帖子
-            if (req.page.pageNumber == 1 && recmdIds.size() < pageSize) {
-                recmdIds.addAll(recommendService.getRecommendThemes(pageStart, pageSize, userId, recmdIds, firstThemeTime));
+            if (req.page.pageNumber <= 3 && recmdIds.size() < pageSize) {
+                List<String> reSearchIds=ListUtils.union(excludeIds, recmdIds);
+                recmdIds.addAll(recommendService.getRecommendThemes(pageStart, pageSize, userId, reSearchIds, firstThemeTime));
             }
 
             themes = themeService.queryByThemeIds(recmdIds);

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

@@ -135,7 +135,7 @@ public class RankService {
         //排序
         hotestThemes = map.entrySet().stream()
                 .sorted(Map.Entry.comparingByValue(Comparator.reverseOrder()))
-                .map(e -> e.getKey()).collect(Collectors.toList());
+                .map(Map.Entry::getKey).collect(Collectors.toList());
         //落库
         rankLogService.logThemeRank(hotestThemes, start, TimeUtils.calMillisTillNow(start));
     }