From 944d36e5e7c3cf2c3ed9b2234dc172a01afb0e59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B1=88=E5=B1=95=E8=88=AA?= <2426745133@qq.com>
Date: Fri, 26 Sep 2025 11:37:24 +0800
Subject: [PATCH] =?UTF-8?q?09-26-=E4=BF=AE=E5=A4=8D=E8=81=94=E7=B3=BB?=
 =?UTF-8?q?=E4=BA=BA=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Impl/ChatFriendshipServiceImpl.java       | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/websocket/service/Impl/ChatFriendshipServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/websocket/service/Impl/ChatFriendshipServiceImpl.java
index dd6344df..851d85df 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/websocket/service/Impl/ChatFriendshipServiceImpl.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/websocket/service/Impl/ChatFriendshipServiceImpl.java
@@ -34,6 +34,7 @@ import org.dromara.websocket.mapper.ChatFriendshipMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -51,14 +52,15 @@ public class ChatFriendshipServiceImpl extends ServiceImpl<ChatFriendshipMapper,
     private BusUserProjectRelevancyServiceImpl busUserProjectRelevancyService;
 
     public R<TableDataInfo<SysUserVo>> getAppUserList(SysUserBo user, PageQuery pageQuery){
-        LambdaQueryWrapper<BusUserProjectRelevancy> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-        lambdaQueryWrapper.eq(BusUserProjectRelevancy::getUserId, LoginHelper.getUserId());
-        List<BusUserProjectRelevancy> one = busUserProjectRelevancyService.list(lambdaQueryWrapper);
-        if (one == null || one.isEmpty()){
-            return R.fail("该账号暂无项目组，请尽快联系管理员进行分配");
-        }
+//        LambdaQueryWrapper<BusUserProjectRelevancy> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+//        lambdaQueryWrapper.eq(BusUserProjectRelevancy::getUserId, LoginHelper.getUserId());
+//        List<BusUserProjectRelevancy> one = busUserProjectRelevancyService.list(lambdaQueryWrapper);
+//        if (one == null || one.isEmpty()){
+//            return R.fail("该账号暂无项目组，请尽快联系管理员进行分配");
+//        }
         Page<SysUserVo> page = sysUserMapper.selectPageUserList(pageQuery.build(), this.buildQueryWrapper(user));
         List<SysUserVo> userVoList = page.getRecords();
+        List<SysUserVo> temps = new ArrayList<>();
         List<Long> userIdList = userVoList.stream().map(SysUserVo::getUserId).toList();
         if (CollUtil.isNotEmpty(userIdList)) {
             List<SysUserFile> userFileList = userFileService.lambdaQuery()
@@ -69,9 +71,7 @@ public class ChatFriendshipServiceImpl extends ServiceImpl<ChatFriendshipMapper,
 
                 Long userId = userVo.getUserId();
 
-                if (userId.equals(LoginHelper.getUserId())){
-                    userVoList.remove(userVo);
-                }else {
+                if (!userId.equals(LoginHelper.getUserId())){
                     if (userFileMap.containsKey(userId)) {
                         List<SysUserFile> fileList = userFileMap.get(userId);
                         String fileIdStr = fileList.stream()
@@ -79,9 +79,11 @@ public class ChatFriendshipServiceImpl extends ServiceImpl<ChatFriendshipMapper,
                             .collect(Collectors.joining(","));
                         userVo.setFilePath(fileIdStr);
                     }
+                    temps.add(userVo);
                 }
+
             });
-            page.setRecords(userVoList);
+            page.setRecords(temps);
         }
         return R.ok(TableDataInfo.build(page));
     }