From 41b6d0c9c00b24534a90bbd4cdeb0537cb889c67 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期五, 23 一月 2026 09:49:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/java/com/ruoyi/project/system/service/impl/SysNoticeServiceImpl.java | 103 ++++++++++++++++++++++++++++++---------------------
1 files changed, 61 insertions(+), 42 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 79a5750..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
@@ -5,6 +5,8 @@
import java.util.Map;
import java.util.Objects;
import java.util.stream.Collectors;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -12,6 +14,11 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.xiaoymin.knife4j.core.util.StrUtil;
import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.project.system.domain.SysDept;
+import com.ruoyi.project.system.domain.SysUser;
+import com.ruoyi.project.system.domain.SysUserDept;
+import com.ruoyi.project.system.mapper.SysDeptMapper;
+import com.ruoyi.project.system.mapper.SysUserDeptMapper;
import com.ruoyi.project.system.mapper.SysUserMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
@@ -33,6 +40,12 @@
@Autowired
private SysUserMapper userMapper;
+
+ @Autowired
+ private SysDeptMapper deptMapper;
+
+ @Autowired
+ private SysUserDeptMapper userDeptMapper;
@Autowired
@Lazy
@@ -126,58 +139,64 @@
}
@Override
- 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)) {
- return;
- }
- List<String> rolesWithAdmin = new ArrayList<>(needPushRoles);
- rolesWithAdmin.add("绠＄悊鍛�");
- List<SysNotice> collect = rolesWithAdmin.stream()
- .flatMap(it -> userMapper.getUserByRole(it).stream())
- .map(it -> convertSysNotice(title, message, it,tenantId, jumpPath, userId))
- .collect(Collectors.toList());
- sysNoticeService.insertBatch(collect);
- }
-
- @Override
- public void simpleNoticeByPerms(String title, String message, Long tenantId, List<String> needPerms,
- String jumpPath) {
+ public void simpleNoticeByUser(String title, String message, List<Long> consigneeId, 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,tenantId, jumpPath, userId)).collect(Collectors.toList());
- sysNoticeService.insertBatch(collect);
- }
-
- @Override
- public void simpleNoticeByUser(String title, String message, List<Long> consigneeId, Long tenantId,
- 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 tenantId,String jumpPath) {
+ public void simpleNoticeAll(String title, String message, String jumpPath) {
Long userId = SecurityUtils.getLoginUser().getUserId();
- List<SysNotice> collect = userMapper.selectList(null).stream().map(it -> convertSysNotice(title, message, it.getUserId(),tenantId, jumpPath, userId)).collect(Collectors.toList());
+ if (userId == null) {
+ return;
+ }
+ Long rootDeptId = SecurityUtils.getLoginUser().getTenantId();
+ // 鏌ユ墍鏈夊瓙閮ㄩ棬
+ List<SysDept> childrenDepts = deptMapper.selectChildrenDeptById(rootDeptId);
+
+ // 缁勮 deptIds
+ List<Long> deptIds = childrenDepts.stream()
+ .map(SysDept::getDeptId)
+ .collect(Collectors.toList());
+ deptIds.add(rootDeptId);
+
+ // 鏌ョ敤鎴稩D
+ List<Long> userIds = userDeptMapper.selectList(
+ Wrappers.<SysUserDept>lambdaQuery()
+ .in(SysUserDept::getDeptId, deptIds)
+ ).stream()
+ .map(SysUserDept::getUserId)
+ .distinct()
+ .collect(Collectors.toList());
+
+ if (userIds.isEmpty()) {
+ return;
+ }
+
+ // 鏌ョ敤鎴�
+ List<SysUser> sysUsers = userMapper.selectList(
+ Wrappers.<SysUser>lambdaQuery()
+ .eq(SysUser::getStatus, "0")
+ .in(SysUser::getUserId, userIds)
+ );
+
+ // 鍙戦�氱煡
+ List<SysNotice> collect = sysUsers.stream()
+ .map(it -> convertSysNotice(
+ title,
+ message,
+ it.getUserId(),
+ it.getTenantId(),
+ jumpPath,
+ userId
+ ))
+ .collect(Collectors.toList());
+
sysNoticeService.saveBatch(collect);
}
- @Override
- public void insertBatch(List<SysNotice> noticesList) {
- if(CollectionUtils.isEmpty(noticesList)){
- return;
- }
- // 鎺掗櫎鎺夎嚜宸�
- Long userId = SecurityUtils.getUserId();
- List<SysNotice> noticesListNew = noticesList.stream().filter(Objects::nonNull).filter(it -> !Objects.equals(it.getConsigneeId(), userId)).collect(Collectors.toList());
- sysNoticeService.saveBatch(noticesListNew);
-
- }
private SysNotice convertSysNotice(String title,String message,Long consigneeId, Long tenantId,String jumpPath,Long currentUserId) {
SysNotice sysNotice = new SysNotice();
--
Gitblit v1.9.3