From 91e47af5b8df0fef01639faff46467d21c11e959 Mon Sep 17 00:00:00 2001
From: linhw <5331581+linhw11@user.noreply.gitee.com>
Date: Thu, 16 May 2024 14:16:31 +0800
Subject: [PATCH] ~

---
 .../com/mdd/common/vo/CircleDetailVo.java     |  5 ++--
 .../service/impl/AppCircleServiceImpl.java    | 27 +++++++++++--------
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/server/like-common/src/main/java/com/mdd/common/vo/CircleDetailVo.java b/server/like-common/src/main/java/com/mdd/common/vo/CircleDetailVo.java
index c784637..8371667 100644
--- a/server/like-common/src/main/java/com/mdd/common/vo/CircleDetailVo.java
+++ b/server/like-common/src/main/java/com/mdd/common/vo/CircleDetailVo.java
@@ -63,7 +63,6 @@ public class CircleDetailVo implements Serializable {
     @ApiModelProperty(value = "是否加入1是2否")
     private Integer is_join;
 
-
-
-
+    @ApiModelProperty(value = "用户头像，存在多张用逗号分开")
+    private String imgUrls;
 }
diff --git a/server/like-front/src/main/java/com/mdd/front/service/impl/AppCircleServiceImpl.java b/server/like-front/src/main/java/com/mdd/front/service/impl/AppCircleServiceImpl.java
index afb0ce2..7773040 100644
--- a/server/like-front/src/main/java/com/mdd/front/service/impl/AppCircleServiceImpl.java
+++ b/server/like-front/src/main/java/com/mdd/front/service/impl/AppCircleServiceImpl.java
@@ -6,12 +6,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.mdd.common.core.AjaxResult;
-import com.mdd.common.entity.AppCircleAddress;
-import com.mdd.common.entity.AppCircleUser;
-import com.mdd.common.entity.AppFriend;
-import com.mdd.common.mapper.AppCircleAddressMapper;
-import com.mdd.common.mapper.AppCircleUserMapper;
-import com.mdd.common.mapper.AppFriendMapper;
+import com.mdd.common.entity.*;
+import com.mdd.common.mapper.*;
 import com.mdd.common.vo.AppCircleVo;
 import com.mdd.common.vo.CircleDetailVo;
 import com.mdd.front.validate.common.PageValidate;
@@ -22,8 +18,6 @@ import com.mdd.front.validate.AppCircleSearchValidate;
 
 import com.mdd.front.vo.AppCircleDetailVo;
 import com.mdd.common.core.PageResult;
-import com.mdd.common.entity.AppCircle;
-import com.mdd.common.mapper.AppCircleMapper;
 import com.mdd.common.util.TimeUtils;
 import com.mdd.front.vo.AppCircleListedVo;
 import io.swagger.models.auth.In;
@@ -56,6 +50,9 @@ public class AppCircleServiceImpl implements IAppCircleService {
     @Resource
     AppFriendMapper appFriendMapper;
 
+    @Resource
+    AppUserMapper appUserMapper;
+
     /**
      * 圈子信息列表
      *
@@ -225,13 +222,21 @@ public class AppCircleServiceImpl implements IAppCircleService {
                 .eq("user_id",userId)
         );
         Integer friendNum = 0;
-        List<Integer> friendIds = friends.stream().map(x->x.getFriendId()).collect(Collectors.toList());
-        for (Integer friendId : friendIds) {
-            if (ids.contains(friendId)) {
+        for (AppFriend friend : friends) {
+            if (ids.contains(friend.getFriendId())) {
                 friendNum = friendNum + 1;
             }
         }
         model.setFriendNum(friendNum);
+        StringBuilder imgUrls = new StringBuilder();
+        for (int i = 0; i < ids.size(); i++) {
+            if (i < 3) {
+                AppUser appUser = appUserMapper.selectById(ids.get(i));
+                imgUrls.append(appUser.getAvatar());
+                imgUrls.append(",");
+            }
+        }
+        model.setImgUrls(imgUrls.toString());
         return model;
     }