From 68d4b9484a3d1874703d79d87f8015998213d9a8 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 12 一月 2026 14:35:00 +0800
Subject: [PATCH] 消息通知与协同审批联动
---
src/main/java/com/ruoyi/project/system/service/impl/SysNoticeServiceImpl.java | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/ruoyi/project/system/service/impl/SysNoticeServiceImpl.java b/src/main/java/com/ruoyi/project/system/service/impl/SysNoticeServiceImpl.java
index f600e91..79a5750 100644
--- a/src/main/java/com/ruoyi/project/system/service/impl/SysNoticeServiceImpl.java
+++ b/src/main/java/com/ruoyi/project/system/service/impl/SysNoticeServiceImpl.java
@@ -126,7 +126,7 @@
}
@Override
- public void simpleNoticeByRoles(final String title, String message, List<String> needPushRoles,
+ public void simpleNoticeByRoles(final String title, String message, Long tenantId, List<String> needPushRoles,
final String jumpPath) {
Long userId = SecurityUtils.getUserId();
if (StrUtil.isBlank(message) || CollectionUtils.isEmpty(needPushRoles)) {
@@ -136,34 +136,34 @@
rolesWithAdmin.add("绠＄悊鍛�");
List<SysNotice> collect = rolesWithAdmin.stream()
.flatMap(it -> userMapper.getUserByRole(it).stream())
- .map(it -> convertSysNotice(title, message, it, jumpPath, userId))
+ .map(it -> convertSysNotice(title, message, it,tenantId, jumpPath, userId))
.collect(Collectors.toList());
sysNoticeService.insertBatch(collect);
}
@Override
- public void simpleNoticeByPerms(String title, String message, List<String> needPerms,
+ public void simpleNoticeByPerms(String title, String message, Long tenantId, List<String> needPerms,
String jumpPath) {
Long userId = SecurityUtils.getLoginUser().getUserId();
if (StrUtil.isBlank(message) || CollectionUtils.isEmpty(needPerms)) {
return;
}
- List<SysNotice> collect = userMapper.getUserByPerms(needPerms).stream().map(it -> convertSysNotice(title, message, it, jumpPath, userId)).collect(Collectors.toList());
+ List<SysNotice> collect = userMapper.getUserByPerms(needPerms).stream().map(it -> convertSysNotice(title, message, it,tenantId, jumpPath, userId)).collect(Collectors.toList());
sysNoticeService.insertBatch(collect);
}
@Override
- public void simpleNoticeByUser(String title, String message, Long consigneeId,
+ public void simpleNoticeByUser(String title, String message, List<Long> consigneeId, Long tenantId,
String jumpPath) {
Long userId = SecurityUtils.getLoginUser().getUserId();
- SysNotice sysNotice = convertSysNotice(title, message, consigneeId, jumpPath, userId);
- sysNoticeService.save(sysNotice);
+ List<SysNotice> sysNotices = consigneeId.stream().map(it -> convertSysNotice(title, message, it,tenantId, jumpPath, userId)).collect(Collectors.toList());
+ sysNoticeService.saveBatch(sysNotices);
}
@Override
- public void simpleNoticeAll(String title, String message, String jumpPath) {
+ public void simpleNoticeAll(String title, String message, Long tenantId,String jumpPath) {
Long userId = SecurityUtils.getLoginUser().getUserId();
- List<SysNotice> collect = userMapper.selectList(null).stream().map(it -> convertSysNotice(title, message, it.getUserId(), jumpPath, userId)).collect(Collectors.toList());
+ List<SysNotice> collect = userMapper.selectList(null).stream().map(it -> convertSysNotice(title, message, it.getUserId(),tenantId, jumpPath, userId)).collect(Collectors.toList());
sysNoticeService.saveBatch(collect);
}
@@ -179,7 +179,7 @@
}
- private SysNotice convertSysNotice(String title,String message,Long consigneeId,String jumpPath,Long currentUserId) {
+ private SysNotice convertSysNotice(String title,String message,Long consigneeId, Long tenantId,String jumpPath,Long currentUserId) {
SysNotice sysNotice = new SysNotice();
sysNotice.setNoticeType("1");
sysNotice.setNoticeTitle(title);//鏍囬
@@ -188,6 +188,7 @@
sysNotice.setConsigneeId(consigneeId);
sysNotice.setSenderId(currentUserId);
sysNotice.setJumpPath(jumpPath);
+ sysNotice.setTenantId(tenantId);
return sysNotice;
}
}
--
Gitblit v1.9.3