From 1a4cbd9b2984c284a1fa951fe3c161ad35d5f77a Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Tue, 20 Jun 2023 17:52:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/yxt/messagecenter/biz/message/MessageService.java   | 6 ++++++
 .../yxt/messagecenter/biz/messagelist/MessageListMapper.xml | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

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 b489ed7..0293fb4 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
@@ -318,6 +318,8 @@ public class MessageService extends MybatisBaseService<MessageMapper, Message> {
         ResultBean<String> rb = ResultBean.fireFail();
         String msgTitle = dto.getMsgTitle();
         String msgContent = dto.getMsgContent();
+        String orgPath = dto.getOrgPath();
+        SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.selectByOrgSidPath(orgPath).getData();
         List<String> list = dto.getList();
         List<String> receiveIdList = dto.getReceiveIdList();
         List<String> orgPathList = dto.getOrgPathList();
@@ -349,6 +351,8 @@ public class MessageService extends MybatisBaseService<MessageMapper, Message> {
         messageDto.setMsgTargetUri(dto.getModuleAction());
         messageDto.setModuleAction(dto.getModuleAction2());
         messageDto.setSenderName("系统");
+        messageDto.setSenderDeptSid(sysOrganizationVo.getSid());
+        messageDto.setSenderDeptName(sysOrganizationVo.getName());
         String msgSid = saveOrUpdateAppMessage(messageDto).getData();
         String msgTypeSid = messageDto.getMsgTypeSid();
         // 2、保存至消息列表
@@ -470,6 +474,7 @@ public class MessageService extends MybatisBaseService<MessageMapper, Message> {
     public ResultBean<String> pushMessageForCC(MessageFlowableQueryForCC query) {
         ResultBean<String> rb = ResultBean.fireFail();
         MessageFlowVo ufVo = query.getUfVo();
+        String orgPath = query.getOrgPath();
         String procId = ufVo.getProcInsId();
         String procDefId = ufVo.getProcDefId();
         Map<String, Object> appMap = query.getAppMap();
@@ -516,6 +521,7 @@ public class MessageService extends MybatisBaseService<MessageMapper, Message> {
         messageFlowableDto.setMsgTitle(msgTitle);
         messageFlowableDto.setCreateName(applicationName);
         messageFlowableDto.setTaskId(ufVo.getTaskId());
+        messageFlowableDto.setOrgPath(orgPath);
         ResultBean<String> stringResultBean = getMessageRead(messageFlowableDto);
         String msgSid = stringResultBean.getData();
         return rb.success().setMsg(msgSid);
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 8c67f8e..722132d 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
@@ -285,7 +285,7 @@
         FROM message_list ml
                      LEFT JOIN message m ON ml.msgSid = m.sid
         where receiverSid = #{userSid}
-        and m.msgType = "抄送"
+        and m.msgType LIKE concat('%','抄送','%')
         and ml.state = 0
     </select>
 </mapper>
\ No newline at end of file