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

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/websocket/controller/ChatGroupController.java

@@ -127,20 +127,17 @@ 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("没有数据");
-        }
-    }
-
     /**
      * 查看某个房间的详情信息 传递房间ID
      */

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/websocket/service/Impl/ChatFriendshipServiceImpl.java

@@ -66,7 +66,12 @@ 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 (userId.equals(LoginHelper.getUserId())){
+                    userVoList.remove(userVo);
+                }else {
                     if (userFileMap.containsKey(userId)) {
                         List<SysUserFile> fileList = userFileMap.get(userId);
                         String fileIdStr = fileList.stream()
@@ -74,6 +79,7 @@ public class ChatFriendshipServiceImpl extends ServiceImpl<ChatFriendshipMapper,
                             .collect(Collectors.joining(","));
                         userVo.setFilePath(fileIdStr);
                     }
+                }
             });
             page.setRecords(userVoList);
         }