diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/websocket/ChatServerHandler.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/websocket/ChatServerHandler.java
index fb8a6a85..dfd5834b 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/websocket/ChatServerHandler.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/websocket/ChatServerHandler.java
@@ -303,11 +303,11 @@ public class ChatServerHandler extends SimpleChannelInboundHandler<TextWebSocket
         }else if ("1".equals(type)){
             log.info("收到客户端确认消息：{}", jsonObject);
             //前端接收方收到消息返回1 说明此时处于聊天框内 可以清空该房间的所有未读消息 将此房间聊天记录全部已读
+            //现在是用户发送消息 ctx为接收方用户
             LambdaQueryWrapper<ChatHistory> lambdaQueryWrapper = new LambdaQueryWrapper<>();
             lambdaQueryWrapper
-                .eq(ChatHistory::getSenderId,jsonObject.get("from"))
+                .ne(ChatHistory::getSenderId,sysUserVo.getUserId().toString())
                 .eq(ChatHistory::getGeterId,jsonObject.get("roomId"))
-//                .eq(ChatHistory::getMessage,jsonObject.get("message"))
                 .eq(ChatHistory::getIsRead,"1");
             List<ChatHistory> list = chatHistoryService.list(lambdaQueryWrapper);
             if (list != null && !list.isEmpty()){
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 7535362c..a7c3a82b 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
@@ -159,14 +159,15 @@ public class ChatGroupController {
             if (sysUserVo != null) {
                 byId.setName(sysUserVo.getNickName());
                 byId.setAvatar(sysUserVo.getAvatar());
-            }else if (list.getFirst().equals(99L)){
-                byId.setName("系统消息");
-                byId.setAvatar(null);
             }else{
                 byId.setName("此用户已注销");
                 byId.setAvatar(null);
             }
-        }else {
+        }else if (byId.getType().equals("2")){
+            //消息通知
+            byId.setName("系统消息");
+            byId.setAvatar(null);
+        } else {
             //群聊 则只需要将群主头像赋值给群聊头像
             SysUserVo sysUserVo = sysUserService.selectUserById(byId.getOwerId());
             if (sysUserVo != null){