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 54f1a87c..faf6aee8 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
@@ -109,7 +109,7 @@ public class ChatGroupController {
         if (!list.isEmpty()) {
             for (ChatGroup chatGroup : list) {
                 setValue(chatGroup, userId);
-                if (!searchObject.getName().isEmpty()) {
+                if (searchObject != null && searchObject.getName() != null && !searchObject.getName().isEmpty()) {
                     if (chatGroup.getName().contains(searchObject.getName())) {
                         searchTemp.add(chatGroup);
                     }