From 53bf1e11c46964e15ab2d334457066ed3b68c98d Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期五, 06 六月 2025 12:57:57 +0800
Subject: [PATCH] refactor(lb-eims):调整代码和更新配置- 注释掉 EimsEquImportVo 中的 @ExcelProperty 注解 - 优化 EimsEquImportListener 中的异常日志输出- 更新 snailjob 监控页面的 iframe 源地址- 修改移动端项目的 API 基础 URL - 优化移动端页面跳转逻辑 - 改进维修请求列表的接单操作流程
---
eims/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java | 29 +++++++++++++++++++++++++++++
1 files changed, 29 insertions(+), 0 deletions(-)
diff --git a/eims/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java b/eims/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java
index 2540606..e2b2e6e 100644
--- a/eims/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java
+++ b/eims/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java
@@ -42,6 +42,8 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
/**
* 鐢ㄦ埛 涓氬姟灞傚鐞�
@@ -556,6 +558,33 @@
return baseMapper.selectVoList(lqw);
}
+ @Override
+ public List<SysUserVo> selectDeptRoleUserList(SysUserBo user) {
+ List<SysUserVo> result = new ArrayList<>();
+ if (user.getDeptId() == null) return result;
+ LambdaQueryWrapper<SysUser> queryWrapper = Wrappers.lambdaQuery();
+ queryWrapper.eq(SysUser::getDeptId, user.getDeptId());
+ List<SysUserVo> deptUserList = baseMapper.selectVoList(queryWrapper);
+ if (user.getRoleKey() != null) {
+ LambdaQueryWrapper<SysRole> roleWrapper = Wrappers.lambdaQuery();
+ roleWrapper.eq(SysRole::getRoleKey, user.getRoleKey());
+ SysRole sysRole = roleMapper.selectOne(roleWrapper);
+ if (sysRole != null) {
+ LambdaQueryWrapper<SysUserRole> userRoleWrapper = Wrappers.lambdaQuery();
+ userRoleWrapper.eq(SysUserRole::getRoleId, sysRole.getRoleId());
+ List<SysUserRole> sysUserRoles = userRoleMapper.selectList(userRoleWrapper);
+ Set<Long> roleUserIds = sysUserRoles.stream()
+ .map(SysUserRole::getUserId)
+ .collect(Collectors.toSet());
+ deptUserList = deptUserList.stream()
+ .filter(u -> roleUserIds.contains(u.getUserId()))
+ .toList();
+ result.addAll(deptUserList);
+ }
+ }
+ return result;
+ }
+
/**
* 閫氳繃鐢ㄦ埛ID鏌ヨ鐢ㄦ埛璐︽埛
*
--
Gitblit v1.9.3