From 681de5866a63d07fd1e35f844287cb44bfafde1b Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Thu, 25 Jul 2024 10:10:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=81=8A=E5=A4=A9=E5=AE=A4?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../chat/service/impl/ChatConversationServiceImpl.java        | 2 +-
 src/main/resources/mapper/chat/ChatConversationDao.xml        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/sqx/modules/chat/service/impl/ChatConversationServiceImpl.java b/src/main/java/com/sqx/modules/chat/service/impl/ChatConversationServiceImpl.java
index 9a13c22..031d771 100644
--- a/src/main/java/com/sqx/modules/chat/service/impl/ChatConversationServiceImpl.java
+++ b/src/main/java/com/sqx/modules/chat/service/impl/ChatConversationServiceImpl.java
@@ -43,7 +43,7 @@ public class ChatConversationServiceImpl extends ServiceImpl<ChatConversationDao
         if(chatConversation!=null){
             return chatConversation;
         }
-        return baseMapper.selectOne(new QueryWrapper<ChatConversation>().eq("focused_user_id", userId).eq("user_id", focusedUserId));
+        return baseMapper.selectOne(new QueryWrapper<ChatConversation>().eq("focused_user_id", focusedUserId).eq("user_id", userId));
     }
 
 
diff --git a/src/main/resources/mapper/chat/ChatConversationDao.xml b/src/main/resources/mapper/chat/ChatConversationDao.xml
index 5420e7c..5da88b8 100644
--- a/src/main/resources/mapper/chat/ChatConversationDao.xml
+++ b/src/main/resources/mapper/chat/ChatConversationDao.xml
@@ -31,7 +31,7 @@
 			<if test="null != userId and '' != userId">
 				user_id,
 			</if>
-			<if test="null != focusedUserId and '' != focusedUserId">
+			<if test="null != focusedUserId">
 				focused_user_id,
 			</if>
 			<if test="null != status and '' != status">
@@ -51,7 +51,7 @@
 			<if test="null != userId and '' != userId">
 				#{userId},
 			</if>
-			<if test="null != focusedUserId and '' != focusedUserId">
+			<if test="null != focusedUserId">
 				#{focusedUserId},
 			</if>
 			<if test="null != status and '' != status">