Merge remote-tracking branch 'origin/bugfix-20211015' into dev

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

@@ -264,20 +264,21 @@ public class HomePageManager {
         List<UserInfoResp> userInfoNews = feignClientForFatools.queryUserListNew(userIdsPage.getContent());
         List<FollowQo> followQos = userInfoNews.stream().map(ConvertUtil::userInfoNew2FollowQo).collect(Collectors.toList());
         if (StringUtils.isNotEmpty(userId)) {
-            judgeFollowed(followQos, userId);
+            followQos = judgeFollowed(followQos, userId);
         }
         return PageUtils.page(userIdsPage, followQos);
     }
 
 
     //判断返回列表中的用户是否被当前用户关注
-    public void judgeFollowed(List<FollowQo> followQos, @NotEmpty String followerId) {
+    public List<FollowQo> judgeFollowed(List<FollowQo> followQos, @NotEmpty String followerId) {
         Set<String> idolSet = new HashSet<>(followRelService.queryIdolsByFansId(followerId));
-        followQos.stream().peek(o -> {
+        return followQos.stream().map(o -> {
             if (idolSet.contains(o.getUserId())) {
                 o.setFollowed(true);
             }
-        });
+            return o;
+        }).collect(Collectors.toList());
     }
 
     public void addFollowRel(FollowRelReq req, String followerId) {