From 40238efd8a82e2b13266a890e2990e22fdfa9b3b Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 28 May 2021 11:12:35 +0800
Subject: [PATCH] Merge branch 'otc' of http://120.27.238.55:7000/r/exchange into otc
---
src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcMsgServiceImpl.java | 4 +++-
src/main/resources/mapper/otc/OtcMsgUserListDao.xml | 5 +----
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcMsgServiceImpl.java b/src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcMsgServiceImpl.java
index d344999..67a62fa 100644
--- a/src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcMsgServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcMsgServiceImpl.java
@@ -48,7 +48,9 @@
public IPage<MsgListVo> getMsgList(MsgListDto msgListDto) {
MemberEntity member = LoginUserUtils.getAppLoginUser();
Long memberId = member.getId();
-// Long memberId = 443L;
+// Long memberId = 444L;
+// MemberEntity member = memberDao.selectById(memberId);
+
Page<MsgListVo> page = new Page<>(msgListDto.getPageNum(), msgListDto.getPageSize());
OtcMsgUserListEntity otcMsgUserListEntity = new OtcMsgUserListEntity();
diff --git a/src/main/resources/mapper/otc/OtcMsgUserListDao.xml b/src/main/resources/mapper/otc/OtcMsgUserListDao.xml
index b1244d9..b484781 100644
--- a/src/main/resources/mapper/otc/OtcMsgUserListDao.xml
+++ b/src/main/resources/mapper/otc/OtcMsgUserListDao.xml
@@ -15,12 +15,9 @@
<where>
<if test="record!=null">
a.member_id = #{record.memberId}
- <if test="record.nickname != null and record.nickname == ''">
+ <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