From 77ef1937dc0d39239d3cd6d1dbc826db88717951 Mon Sep 17 00:00:00 2001
From: dimengzhe <251008545@qq.com>
Date: Fri, 3 Mar 2023 16:16:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yxt/messagecenter/biz/message/MessageService.java | 11 ++++-------
 .../biz/messagelist/MessageListMapper.xml             |  4 ++--
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/message-center-biz/src/main/java/com/yxt/messagecenter/biz/message/MessageService.java b/message-center-biz/src/main/java/com/yxt/messagecenter/biz/message/MessageService.java
index 53cccd7..ec71e41 100644
--- a/message-center-biz/src/main/java/com/yxt/messagecenter/biz/message/MessageService.java
+++ b/message-center-biz/src/main/java/com/yxt/messagecenter/biz/message/MessageService.java
@@ -323,15 +323,15 @@ public class MessageService extends MybatisBaseService<MessageMapper, Message> {
         messageBean.removeAll(Collections.singleton(null));
         if (!messageBean.isEmpty()) {
             for (MessageTypeVo message : messageBean) {
-                if (message.getMsgType().equals("抄送")) {
+                if (message.getMsgType().contains("抄送")) {
                     messageDto.setMsgTypeSid(message.getMsgTypeSid());
                     messageDto.setMsgType(message.getMsgType());
                 }
             }
         }
-        if (StringUtils.isNotBlank(dto.getTaskId())) {
+      /*  if (StringUtils.isNotBlank(dto.getTaskId())) {
             messageDto.setTaskId(dto.getTaskId());
-        }
+        }*/
         messageDto.setMsgTitle(msgTitle);
         messageDto.setMsgContent(msgContent);
         messageDto.setMsgSource("抄送");
@@ -969,15 +969,12 @@ public class MessageService extends MybatisBaseService<MessageMapper, Message> {
         messageBean.removeAll(Collections.singleton(null));
         if (!messageBean.isEmpty()) {
             for (MessageTypeVo message : messageBean) {
-                if (message.getMsgType().equals("抄送")) {
+                if (message.getMsgType().contains("分享")) {
                     messageDto.setMsgTypeSid(message.getMsgTypeSid());
                     messageDto.setMsgType(message.getMsgType());
                 }
             }
         }
-        if (StringUtils.isNotBlank(dto.getTaskId())) {
-            messageDto.setTaskId(dto.getTaskId());
-        }
         messageDto.setMsgTitle(msgTitle);
         messageDto.setMsgContent(msgContent);
         messageDto.setMsgSource("分享");
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 82cad24..4af5c2c 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
@@ -235,11 +235,11 @@
         m.msgTitle,
         m.msgContent,
         ml.state,
-        DATE_FORMAT(ml.createTime, '%Y-%m-%d %H:%m:%s') as sendTime,
+        DATE_FORMAT(ml.createTime, '%Y-%m-%d %H:%i:%s') as sendTime,
         m.msgTargetUri as moduleAction,
         m.senderName,
         m.msgSource,
-        DATE_FORMAT(ml.modifyTime, '%Y-%m-%d %H:%m:%s') as redTime
+        DATE_FORMAT(ml.modifyTime, '%Y-%m-%d %H:%i:%s') as redTime
         FROM message_list ml
         LEFT JOIN message m ON ml.msgSid = m.sid
         <where>