lift-ud-service/src/main/java/cn/com/ty/lift/ud/chat/mapper/ChatSessionMapper.java

@@ -70,7 +70,7 @@ public interface ChatSessionMapper extends BaseMapper<ChatSessionEntity> {
 
     int batchUpdateEntrance(@Param("sessionId") String sessionId, @Param("entrance") Integer entrance);
 
-    @Select("select sessionid from chat_session where (user_id = #{userId}  and create_user_id  = #{createUserId}) or (user_id = #{createUserId}  and create_user_id  = #{userId})   and statuz = #{dataTable}")
+    @Select("select sessionid from chat_session where (user_id = #{userId}  and create_user_id  = #{createUserId}) or (user_id = #{createUserId}  and create_user_id  = #{userId})   and data_table = #{dataTable}")
     String findOneByUserIdAndCreateUserIdAndDateTable(@Param("userId") String userId,
         @Param("createUserId") String createUserId, @Param("dataTable") Integer dataTable);
 

lift-ud-service/src/main/java/cn/com/ty/lift/ud/chat/service/impl/ChatMsgServiceImpl.java

@@ -50,10 +50,12 @@ public class ChatMsgServiceImpl extends ServiceImpl<ChatMsgMapper, ChatMsgEntity
     public RestResponse messageHistory(ChatMsgQuery req) throws Exception {
         List<IMMessage> data = new ArrayList<>();
         List list2 = redis.get("ALLCHATS:" + req.getSessionid(), List.class);
-        for (Object i : list2) {
-            ObjectMapper objectMapper = new ObjectMapper();
-            IMMessage convertValue = objectMapper.convertValue(i, IMMessage.class);
-            data.add(convertValue);
+        if (!list2.isEmpty()) {
+            for (Object i : list2) {
+                ObjectMapper objectMapper = new ObjectMapper();
+                IMMessage convertValue = objectMapper.convertValue(i, IMMessage.class);
+                data.add(convertValue);
+            }
         }
 
         // 查询缓存中是否存在聊天记录

lift-ud-service/src/main/java/cn/com/ty/lift/ud/chat/service/impl/ChatSessionServiceImpl.java

@@ -163,7 +163,7 @@ public class ChatSessionServiceImpl extends ServiceImpl<ChatSessionMapper, ChatS
             ChatSessionEntity record = new ChatSessionEntity();
             //添加自己到房间
             sessionId = UUIDUtil.getUuidByTime9();
-            record.setUserId(request.getCreateUserId());
+            record.setUserId(request.getUserId());
             record.setCreateUserId(request.getCreateUserId());
             record.setSessionid(sessionId);
             record.setDataTable(3);
@@ -173,7 +173,8 @@ public class ChatSessionServiceImpl extends ServiceImpl<ChatSessionMapper, ChatS
             sessionMapper.insertSelective(record);
             //添加对方用户到房间
             record = new ChatSessionEntity();
-            record.setUserId(request.getUserId());
+            record.setUserId(request.getCreateUserId());
+            record.setCreateUserId(null);
             record.setSessionid(sessionId);
             record.setDataTable(3);
             record.setEntrance(1);