From a0914318549b357ef3c438d0c2a3714f58ea3487 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期五, 23 一月 2026 14:14:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/java/com/ruoyi/project/system/service/impl/SysNoticeServiceImpl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 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 2d21535..bf794b5 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
@@ -139,20 +139,20 @@
}
@Override
- public void simpleNoticeByUser(String title, String message, List<Long> consigneeId, Long tenantId,
- String jumpPath) {
+ public void simpleNoticeByUser(String title, String message, List<Long> consigneeId, String jumpPath) {
Long userId = SecurityUtils.getLoginUser().getUserId();
+ Long tenantId = SecurityUtils.getLoginUser().getTenantId();
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, Long rootDeptId, String jumpPath) {
+ public void simpleNoticeAll(String title, String message, String jumpPath) {
Long userId = SecurityUtils.getLoginUser().getUserId();
if (userId == null) {
return;
}
-
+ Long rootDeptId = SecurityUtils.getLoginUser().getTenantId();
// 鏌ユ墍鏈夊瓙閮ㄩ棬
List<SysDept> childrenDepts = deptMapper.selectChildrenDeptById(rootDeptId);
--
Gitblit v1.9.3