From e577147005f0e78e7be9333766032405107b6a26 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 28 May 2021 10:53:45 +0800
Subject: [PATCH] Merge branch 'otc' of http://120.27.238.55:7000/r/exchange into otc

---
 src/main/resources/mapper/otc/OtcMsgUserListDao.xml |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/mapper/otc/OtcMsgUserListDao.xml b/src/main/resources/mapper/otc/OtcMsgUserListDao.xml
index 0be3ee3..b1244d9 100644
--- a/src/main/resources/mapper/otc/OtcMsgUserListDao.xml
+++ b/src/main/resources/mapper/otc/OtcMsgUserListDao.xml
@@ -8,11 +8,19 @@
                a.is_read isRead,
                a.target_id targetId,
                a.member_id memberId,
-               a.last_msg_time lastMsgTime
+               a.last_msg_time lastMsgTime,
+               b.name nickname
         from otc_msg_user_list a
+        left join member b on a.target_id = b.id
         <where>
             <if test="record!=null">
                     a.member_id = #{record.memberId}
+                <if test="record.nickname != null and record.nickname == ''">
+                    and b.name like concat('%',  #{record.nickname},'%')
+                </if>
+            </if>
+            <if test="record!=null">
+                a.member_id = #{record.memberId}
             </if>
         </where>
         order by a.create_time desc

--
Gitblit v1.9.1