diff --git a/m2pool-modules/m2pool-chat/src/main/java/com/m2pool/chat/service/impl/ChatRoomServiceImpl.java b/m2pool-modules/m2pool-chat/src/main/java/com/m2pool/chat/service/impl/ChatRoomServiceImpl.java
index 2beab78..19b827e 100644
--- a/m2pool-modules/m2pool-chat/src/main/java/com/m2pool/chat/service/impl/ChatRoomServiceImpl.java
+++ b/m2pool-modules/m2pool-chat/src/main/java/com/m2pool/chat/service/impl/ChatRoomServiceImpl.java
@@ -1,5 +1,6 @@
 package com.m2pool.chat.service.impl;
 
+import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
@@ -64,7 +65,6 @@ public class ChatRoomServiceImpl extends ServiceImpl<ChatRoomMapper, ChatRoom> i
         //1.查找当前客服对应的聊天室
         roomList = chatRoomMapper.findRoomList(ids,roomPageVo.getSendDateTime());
 
-
 //        if (roomList.isEmpty()){
 //            TableDataInfo tableDataInfo = new TableDataInfo();
 //            tableDataInfo.setCode(HttpStatus.ERROR);
diff --git a/m2pool-modules/m2pool-chat/src/main/resources/mapper/chat/ChatMessageMapper.xml b/m2pool-modules/m2pool-chat/src/main/resources/mapper/chat/ChatMessageMapper.xml
index 78f2ce8..242f417 100644
--- a/m2pool-modules/m2pool-chat/src/main/resources/mapper/chat/ChatMessageMapper.xml
+++ b/m2pool-modules/m2pool-chat/src/main/resources/mapper/chat/ChatMessageMapper.xml
@@ -34,12 +34,8 @@
         GROUP BY send_email
     </select>
     <select id="findRoomIdsByCustomerEmail" resultType="java.lang.Long">
-        select room_id from chat_message where send_email = #{userEmail}  group by room_id
+        select room_id from chat_message   group by room_id
         UNION
-        select room_id from chat_message_history where send_email = #{userEmail}  group by room_id
---     不再展示不存在聊天信息的聊天室
---         UNION
---         select id as room_id from chat_room where user_two_email = #{userEmail}
+        select room_id from chat_message_history   group by room_id
     </select>
-
 </mapper>