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 | 52 +++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 47 insertions(+), 5 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 cc655fc..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
@@ -6,6 +6,8 @@
import com.ruoyi.common.core.domain.entity.User;
import com.ruoyi.common.utils.QueryWrappers;
import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.system.domain.vo.UserVo;
import com.ruoyi.system.mapper.UserMapper;
import com.ruoyi.system.service.UserService;
import org.springframework.stereotype.Service;
@@ -24,12 +26,41 @@
/**
* 鏍规嵁鏉′欢鑾峰彇鐢ㄦ埛鍒楄〃
- * @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) {
+ public List<User> selectUserCondition(User user, String type, Integer departmentId) {
+
+ 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);
}
@@ -38,7 +69,7 @@
* @return
*/
@Override
- public User getUserNow() {
+ public UserVo getUserNow() {
return baseMapper.getUserNow(SecurityUtils.getUserId().intValue());
}
@@ -51,12 +82,23 @@
return baseMapper.selectUserDepartmentLimsName(SecurityUtils.getUserId().intValue());
}
+ /**
+ * 淇敼浜哄憳鏄庣粏鎵�鍦ㄧ粍缁囨灦鏋�
+ * @param ids
+ * @param id
+ * @return
+ */
@Override
public int upUserDepardLimsId(String ids, String id) {
List<Integer> userIds = JSON.parseArray(ids, Integer.class);
- return baseMapper.update(null, Wrappers.<User>lambdaUpdate().in(User::getId, userIds).set(User::getDepartLimsId, id).set(User::getUpdateTime, LocalDateTime.now()).set(User::getUpdateBy,SecurityUtils.getLoginUser().getUsername()));
+ return baseMapper.update(null, Wrappers.<User>lambdaUpdate().in(User::getId, userIds).set(User::getDepartLimsId, id).set(User::getUpdateTime, LocalDateTime.now()).set(User::getUpdateBy, SecurityUtils.getLoginUser().getUsername()));
}
+ /**
+ * 鍒犻櫎浜哄憳鏄庣粏鎵�鍦ㄧ粍缁囨灦鏋�
+ * @param id
+ * @return
+ */
@Override
public int delUserDepardLimsId(Integer id) {
return baseMapper.update(null, Wrappers.<User>lambdaUpdate().eq(User::getId, id).set(User::getDepartLimsId, null).set(User::getUpdateTime, LocalDateTime.now()).set(User::getUpdateBy, SecurityUtils.getUsername()));
--
Gitblit v1.9.3