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 092f5900..54f1a87c 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
@@ -96,18 +96,29 @@ public class ChatGroupController {
      */
 //    @SaCheckPermission("chatGroup:list:getList")
     @GetMapping("/list")
-    public R<List<ChatGroup>> listChatGroup() {
+    public R<List<ChatGroup>> listChatGroup(ChatGroup searchObject,PageQuery pageQuery) {
         Long userId = LoginHelper.getLoginUser().getUserId();
         LambdaQueryWrapper<ChatGroup> queryWrapper = new LambdaQueryWrapper<>();
         //无论单群聊 群聊 成员都会有自己
         queryWrapper.like(ChatGroup::getMembers,userId+",").or().like(ChatGroup::getMembers,userId+"]");//.eq(ChatGroup::getOwerId,userId).or()
+//        queryWrapper.like(searchObject.getName() != null && !searchObject.getName().isEmpty(),ChatGroup::getName,searchObject.getName());
         //按最后聊天时间排序
         queryWrapper.orderByDesc(ChatGroup::getLastMessageTime);
-        List<ChatGroup> list = chatGroupService.list(queryWrapper);
-        for (ChatGroup chatGroup : list) {
-            setValue(chatGroup,userId);
+        List<ChatGroup> list = chatGroupService.page(pageQuery.build(),queryWrapper).getRecords();
+        List<ChatGroup> searchTemp = new ArrayList<>();
+        if (!list.isEmpty()) {
+            for (ChatGroup chatGroup : list) {
+                setValue(chatGroup, userId);
+                if (!searchObject.getName().isEmpty()) {
+                    if (chatGroup.getName().contains(searchObject.getName())) {
+                        searchTemp.add(chatGroup);
+                    }
+                } else {
+                    searchTemp.add(chatGroup);
+                }
+            }
         }
-        return R.ok(list);
+        return R.ok(searchTemp);
     }
 
     /**