From 54502b63bb5915012152d926fedbe4a2fa852e84 Mon Sep 17 00:00:00 2001
From: fengshuonan <sn93@qq.com>
Date: Sun, 14 Jan 2024 22:59:53 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=908.1.0=E3=80=91=E3=80=90notice=E3=80=91?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=B3=BB=E7=BB=9F=E6=B6=88=E6=81=AF=E7=9A=84?=
 =?UTF-8?q?=E6=92=A4=E5=9B=9E=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../message/service/impl/SysMessageServiceImpl.java       | 6 ++++++
 .../modular/notice/service/impl/SysNoticeServiceImpl.java | 8 ++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/sys/modular/message/service/impl/SysMessageServiceImpl.java b/kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/sys/modular/message/service/impl/SysMessageServiceImpl.java
index 9292d6076..c9503d7a5 100644
--- a/kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/sys/modular/message/service/impl/SysMessageServiceImpl.java
+++ b/kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/sys/modular/message/service/impl/SysMessageServiceImpl.java
@@ -111,6 +111,12 @@ public class SysMessageServiceImpl extends ServiceImpl<SysMessageMapper, SysMess
         LambdaUpdateWrapper<SysMessage> wrapper = new LambdaUpdateWrapper<>();
         wrapper.eq(SysMessage::getBusinessType, messageRetractDTO.getBusinessType());
         wrapper.eq(SysMessage::getBusinessId, messageRetractDTO.getBusinessId());
+
+        // 根据选中的人进行撤回
+        if (ObjectUtil.isNotEmpty(messageRetractDTO.getUserIdList())) {
+            wrapper.in(SysMessage::getReceiveUserId, messageRetractDTO.getUserIdList());
+        }
+
         this.remove(wrapper);
     }
 
diff --git a/kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/sys/modular/notice/service/impl/SysNoticeServiceImpl.java b/kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/sys/modular/notice/service/impl/SysNoticeServiceImpl.java
index dc030e0b9..ee642078d 100644
--- a/kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/sys/modular/notice/service/impl/SysNoticeServiceImpl.java
+++ b/kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/sys/modular/notice/service/impl/SysNoticeServiceImpl.java
@@ -10,7 +10,9 @@ import cn.stylefeng.roses.kernel.rule.exception.base.ServiceException;
 import cn.stylefeng.roses.kernel.rule.pojo.dict.SimpleDict;
 import cn.stylefeng.roses.kernel.sys.api.MessagePublishApi;
 import cn.stylefeng.roses.kernel.sys.api.SysUserOrgServiceApi;
+import cn.stylefeng.roses.kernel.sys.api.enums.message.MessageBusinessTypeEnum;
 import cn.stylefeng.roses.kernel.sys.api.enums.notice.NoticePublishStatusEnum;
+import cn.stylefeng.roses.kernel.sys.api.pojo.message.MessageRetractDTO;
 import cn.stylefeng.roses.kernel.sys.modular.notice.entity.SysNotice;
 import cn.stylefeng.roses.kernel.sys.modular.notice.enums.SysNoticeExceptionEnum;
 import cn.stylefeng.roses.kernel.sys.modular.notice.factory.NoticeFactory;
@@ -140,8 +142,10 @@ public class SysNoticeServiceImpl extends ServiceImpl<SysNoticeMapper, SysNotice
         this.updateById(sysNotice);
 
         // 2. 调用撤回接口，将已发送的消息全都撤回
-
-
+        MessageRetractDTO messageRetractDTO = new MessageRetractDTO();
+        messageRetractDTO.setBusinessType(MessageBusinessTypeEnum.SYS_NOTICE.getCode());
+        messageRetractDTO.setBusinessId(String.valueOf(sysNotice.getNoticeId()));
+        messagePublishApi.batchRetractMessage(messageRetractDTO);
     }
 
     @Override