From 23eab88db16bdd73a3de7193188c4633b1929f49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B1=88=E5=B1=95=E8=88=AA?= <2426745133@qq.com>
Date: Thu, 25 Sep 2025 17:34:47 +0800
Subject: [PATCH] =?UTF-8?q?09-25-=E5=AE=8C=E5=96=84=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ChatGroupController.java        |  7 ++-----
 .../Impl/ChatFriendshipServiceImpl.java        | 18 ++++++++++++------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/websocket/controller/ChatGroupController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/websocket/controller/ChatGroupController.java
index c3db642f..0743052b 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/websocket/controller/ChatGroupController.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/websocket/controller/ChatGroupController.java
@@ -127,18 +127,15 @@ public class ChatGroupController {
             for (ChatGroup chatGroup : list){
                 setValue(chatGroup,userId);
             }
+
             if (searchObject != null && searchObject.getName() != null && !searchObject.getName().isEmpty()){
                 return R.ok(
                     list.stream()
                     .filter(chatGroup -> chatGroup.getName().contains(searchObject.getName()))
                     .toList());
-            }else {
-                return R.ok(list);
             }
-
-        }else {
-            return R.fail("没有数据");
         }
+        return R.ok(list);
     }
 
     /**
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 30098193..dd6344df 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
@@ -66,13 +66,19 @@ public class ChatFriendshipServiceImpl extends ServiceImpl<ChatFriendshipMapper,
                 .list();
             Map<Long, List<SysUserFile>> userFileMap = userFileList.stream().collect(Collectors.groupingBy(SysUserFile::getUserId));
             userVoList.forEach(userVo -> {
+
                 Long userId = userVo.getUserId();
-                if (userFileMap.containsKey(userId)) {
-                    List<SysUserFile> fileList = userFileMap.get(userId);
-                    String fileIdStr = fileList.stream()
-                        .map(file -> String.valueOf(file.getFileId()))
-                        .collect(Collectors.joining(","));
-                    userVo.setFilePath(fileIdStr);
+
+                if (userId.equals(LoginHelper.getUserId())){
+                    userVoList.remove(userVo);
+                }else {
+                    if (userFileMap.containsKey(userId)) {
+                        List<SysUserFile> fileList = userFileMap.get(userId);
+                        String fileIdStr = fileList.stream()
+                            .map(file -> String.valueOf(file.getFileId()))
+                            .collect(Collectors.joining(","));
+                        userVo.setFilePath(fileIdStr);
+                    }
                 }
             });
             page.setRecords(userVoList);