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 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