From e50a43bb067adff10cd1dcc81349b1aafdfda882 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 22 一月 2026 13:18:44 +0800
Subject: [PATCH] 业务管理：IFS域区分【ZTNS】和【KJNS】
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserServiceImpl.java | 40 ++++++++++++++++++++++++++++------------
1 files changed, 28 insertions(+), 12 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserServiceImpl.java
index 71fe3b3..557a42b 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserServiceImpl.java
@@ -26,23 +26,39 @@
/**
* 鏍规嵁鏉′欢鑾峰彇鐢ㄦ埛鍒楄〃
- * * todo: type : 1: 鑾峰彇妫�娴嬩汉鍛樹俊鎭�
- * type : 2: 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛閮ㄩ棬涓嬬殑鎵�鏈夌敤鎴�
- * @param user
- * @param type
+ * * todo: type : 1: 鑾峰彇妫�娴嬩汉鍛樹俊鎭�
+ * type : 2: 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛閮ㄩ棬涓嬬殑鎵�鏈夌敤鎴�
+ *
+ * @param user 鐢ㄦ埛
+ * @param type 绫诲瀷
+ * @param departmentId 閮ㄩ棬ID
* @return
*/
@Override
- public List<User> selectUserCondition(User user, String type) {
- if (StringUtils.isNotEmpty(type)) {
+ public List<User> selectUserCondition(User user, String type, Integer departmentId) {
- switch (type) {
- case "1":
- return baseMapper.selectQualityUserList();
- case "2":
- return baseMapper.selectDepartmentLimsUserList(SecurityUtils.getUserId().intValue());
- }
+ if (!StringUtils.isNotEmpty(type)) {
+ return baseMapper.selectUserCondition(QueryWrappers.queryWrappers(user), type);
+ }
+ switch (type) {
+
+ case "1":
+ // 妫�娴嬩汉鍛�
+ return baseMapper.selectQualityUserList();
+
+ case "2":
+ Long currentUserId = SecurityUtils.getUserId();
+ boolean isAdmin = SecurityUtils.isAdmin(currentUserId);
+
+ // 绠＄悊鍛樺垽鏂紝浼犲叆閮ㄩ棬ID灏辨煡瀵瑰簲鐨勯儴闂ㄥ惁鍒欐煡璇㈠叏閮�
+ if (isAdmin) {
+ if (departmentId != null) {
+ return baseMapper.selectUserByDepartmentId(departmentId);
+ }
+ return baseMapper.selectUserCondition(QueryWrappers.queryWrappers(user), type);
+ }
+ return baseMapper.selectDepartmentLimsUserList(currentUserId.intValue());
}
return baseMapper.selectUserCondition(QueryWrappers.queryWrappers(user), type);
--
Gitblit v1.9.3