Merge branch 'otc' of http://120.27.238.55:7000/r/exchange into otc

Helius

2021-05-28 40238efd8a82e2b13266a890e2990e22fdfa9b3b

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

@@ -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();

 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