From b9245ae04cf8af739a10ccf75984fa95a4986d19 Mon Sep 17 00:00:00 2001
From: dimengzhe <251008545@qq.com>
Date: Mon, 17 Apr 2023 17:40:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=85=E5=8A=9E=E5=B7=B2=E5=8A=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/messagelist/app/MessageReadListQuery.java        | 3 +++
 .../messagecenter/biz/messagelist/MessageListMapper.java | 2 +-
 .../messagecenter/biz/messagelist/MessageListMapper.xml  | 9 +++++++++
 .../biz/messagelist/MessageListService.java              | 9 ++++++---
 4 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/message-center-api/src/main/java/com/yxt/messagecenter/api/messagelist/app/MessageReadListQuery.java b/message-center-api/src/main/java/com/yxt/messagecenter/api/messagelist/app/MessageReadListQuery.java
index 83b26b4..91c7fba 100644
--- a/message-center-api/src/main/java/com/yxt/messagecenter/api/messagelist/app/MessageReadListQuery.java
+++ b/message-center-api/src/main/java/com/yxt/messagecenter/api/messagelist/app/MessageReadListQuery.java
@@ -25,4 +25,7 @@ public class MessageReadListQuery implements Query {
     private String createStartTime;
     @ApiModelProperty("发起结束日期")
     private String createEndTime;
+
+    @ApiModelProperty("发送人")
+    private String senderName;
 }
diff --git a/message-center-biz/src/main/java/com/yxt/messagecenter/biz/messagelist/MessageListMapper.java b/message-center-biz/src/main/java/com/yxt/messagecenter/biz/messagelist/MessageListMapper.java
index 2e8d62c..64e6aa9 100644
--- a/message-center-biz/src/main/java/com/yxt/messagecenter/biz/messagelist/MessageListMapper.java
+++ b/message-center-biz/src/main/java/com/yxt/messagecenter/biz/messagelist/MessageListMapper.java
@@ -85,7 +85,7 @@ public interface MessageListMapper extends BaseMapper<MessageList> {
     AppLastMsgVo selectLastMsg(@Param("userSid") String userSid, @Param("msgTypeSid") String msgTypeSid);
 
     IPage<AppMessageListVo> getAppMsgListByUserSid(IPage<AppMessageListQuery> page, @Param(Constants.WRAPPER) QueryWrapper<MessageList> qw);
-    IPage<MessageReadListVo> getAppReadListByUserSid(IPage<MessageReadListQuery> page, @Param(Constants.WRAPPER) QueryWrapper<MessageList> qw);
+    IPage<MessageReadListVo> getAppReadListByUserSid(IPage<MessageReadListQuery> page, @Param(Constants.WRAPPER) QueryWrapper<MessageList> qw,@Param("name") String name);
 
     int updateAppReadByType(@Param("msgTypeSid") String msgTypeSid, @Param("userSid") String userSid);
 
diff --git a/message-center-biz/src/main/java/com/yxt/messagecenter/biz/messagelist/MessageListMapper.xml b/message-center-biz/src/main/java/com/yxt/messagecenter/biz/messagelist/MessageListMapper.xml
index 4cb848e..8c67f8e 100644
--- a/message-center-biz/src/main/java/com/yxt/messagecenter/biz/messagelist/MessageListMapper.xml
+++ b/message-center-biz/src/main/java/com/yxt/messagecenter/biz/messagelist/MessageListMapper.xml
@@ -246,6 +246,15 @@
         <where>
             ${ew.sqlSegment}
             and ml.rDelStatus = 0
+            <if test="name != null and name != ''">
+                and concat(IFNULL(m.msgTitle
+                , '')
+                , IFNULL(m.senderName
+                , '')
+                ) LIKE concat('%'
+                , #{name}
+                , '%')
+            </if>
         </where>
         ORDER BY ml.id DESC
     </select>
diff --git a/message-center-biz/src/main/java/com/yxt/messagecenter/biz/messagelist/MessageListService.java b/message-center-biz/src/main/java/com/yxt/messagecenter/biz/messagelist/MessageListService.java
index 8a32ef4..fae4d57 100644
--- a/message-center-biz/src/main/java/com/yxt/messagecenter/biz/messagelist/MessageListService.java
+++ b/message-center-biz/src/main/java/com/yxt/messagecenter/biz/messagelist/MessageListService.java
@@ -376,16 +376,16 @@ public class MessageListService extends MybatisBaseService<MessageListMapper, Me
         MessageReadListQuery messageReadListQuery = pq.getParams();
         qw.eq("ml.receiverSid", pq.getParams().getUserSid());
         qw.eq("m.msgTypeSid","bc59c198-2d52-bb54-e4106aa38821a9ec");//阅读类
-        if(StringUtils.isNotBlank(messageReadListQuery.getNames())){
+        /*if(StringUtils.isNotBlank(messageReadListQuery.getNames())){
             qw.like("m.msgTitle",messageReadListQuery.getNames());
-        }
+        }*/
         if("0".equals(messageReadListQuery.getState())){//待阅
             qw.eq("ml.state",0);
         }else{//已阅
             qw.eq("ml.state",1);
         }
         IPage<MessageReadListQuery> iPage = PagerUtil.queryToPage(pq);
-        IPage<MessageReadListVo> page = baseMapper.getAppReadListByUserSid(iPage, qw);
+        IPage<MessageReadListVo> page = baseMapper.getAppReadListByUserSid(iPage, qw,messageReadListQuery.getNames());
         PagerVo<MessageReadListVo> pagerVo = PagerUtil.pageToVo(page, null);
         //定义的app的sid的index集合
         Map<String, List<Integer>> appVer = new HashMap<>();
@@ -449,6 +449,9 @@ public class MessageListService extends MybatisBaseService<MessageListMapper, Me
         qw.apply(StringUtils.isNotEmpty(createStartTime), "date_format (m.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
                 apply(StringUtils.isNotEmpty(createEndTime), "date_format (m.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
                 );
+        if(StringUtils.isNotBlank(messageReadListQuery.getSenderName())){
+            qw.like("m.senderName",messageReadListQuery.getSenderName());
+        }
         IPage<MessageReadListQuery> iPage = PagerUtil.queryToPage(pq);
         IPage<MessageReadListPCVo> page = baseMapper.todoAllReadList(iPage, qw);
         PagerVo<MessageReadListPCVo> pagerVo = PagerUtil.pageToVo(page, null);