From 4613099dca2d4e1c7b46a69a98bb4c210312ac57 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 16 四月 2025 11:15:37 +0800
Subject: [PATCH] 代码提交
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
index bce9286..5fa94be 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
@@ -17,6 +17,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
@@ -60,6 +61,9 @@
@Autowired
protected Validator validator;
+
+ @Value("${isAdmin}")
+ private List<Long> isAdmin;
/**
* 鏍规嵁鏉′欢鍒嗛〉鏌ヨ鐢ㄦ埛鍒楄〃
@@ -161,6 +165,7 @@
public SysUser selectUserByUserName2(String userName) {
String[] split = userName.split("&");
SysUser sysUser = userMapper.selectUserByUserNameByCondition(split[0], split[1]);
+ if (Objects.isNull(sysUser)) return sysUser;
List<SysDept> sysDepts = null;
if (StringUtils.isNotEmpty(split[0]) && split[0].equals("admin")) {
SysDept dept = new SysDept();
@@ -176,6 +181,7 @@
SysUserDept sysUserDept = new SysUserDept();
sysUserDept.setUserId(sysUser.getUserId());
sysUserDept.setDeptType(sysUser.getSearchscope());
+ sysUserDept.setOrgid(split[1]);
List<SysUserDept> sysUserDeptKSs = null;
List<SysUserDept> sysUserDeptBQs = null;
if (StringUtils.isNotEmpty(sysUser.getSearchscope()) && sysUser.getSearchscope().equals("0")) {
@@ -192,7 +198,7 @@
Set<String> uniqueDeptCodes = new HashSet<>();
for (SysUserDept userDept : sysUserDeptKSs) {
String deptCode = userDept.getDeptCode();
- if (!uniqueDeptCodes.contains(deptCode)) {
+ if (StringUtils.isNotEmpty(deptCode) && !uniqueDeptCodes.contains(deptCode)) {
distinctUserDepts.add(userDept);
uniqueDeptCodes.add(deptCode);
}
@@ -202,7 +208,7 @@
Set<String> uniqueBQCodes = new HashSet<>();
for (SysUserDept userDept : sysUserDeptBQs) {
String deptCode = userDept.getDeptCode();
- if (!uniqueBQCodes.contains(deptCode)) {
+ if (StringUtils.isNotEmpty(deptCode) && !uniqueBQCodes.contains(deptCode)) {
distinctUserBQs.add(userDept);
uniqueBQCodes.add(deptCode);
}
@@ -226,6 +232,7 @@
Map<String, Object> map = new HashMap<>();
map.put("districtCode", "");
if (StringUtils.isNotEmpty(sud.getDeptCode())) map.put("districtCode", sud.getDeptCode());
+ else continue;
map.put("districtName", "");
if (StringUtils.isNotEmpty(sud.getDeptName())) map.put("districtName", sud.getDeptName());
list.add(map);
@@ -238,6 +245,7 @@
Map<String, Object> map = new HashMap<>();
map.put("deptCode", "");
if (StringUtils.isNotEmpty(sud.getDeptCode())) map.put("deptCode", sud.getDeptCode());
+ else continue;
map.put("deptName", "");
if (StringUtils.isNotEmpty(sud.getDeptName())) map.put("deptName", sud.getDeptName());
list.add(map);
@@ -350,7 +358,7 @@
*/
@Override
public void checkUserAllowed(SysUser user) {
- if (StringUtils.isNotNull(user.getUserId()) && user.isAdmin()) {
+ if (StringUtils.isNotNull(user.getUserId()) && isAdmin.contains(user.getUserId())) {
throw new ServiceException("涓嶅厑璁告搷浣滆秴绾х鐞嗗憳鐢ㄦ埛");
}
}
@@ -362,7 +370,7 @@
*/
@Override
public void checkUserDataScope(Long userId) {
- if (!SysUser.isAdmin(SecurityUtils.getUserId())) {
+ if (!isAdmin.contains(SecurityUtils.getUserId())) {
SysUser user = new SysUser();
user.setUserId(userId);
List<SysUser> users = SpringUtils.getAopProxy(this).selectUserList(user);
@@ -461,6 +469,7 @@
sysUserDept.setUserId(user.getUserId());
sysUserDept.setOrgid(user.getOrgid());
sysUserDept.setDeptCode(deptCode);
+ sysUserDept.setDeptId(sysDept.getDeptId());
List<SysUserDept> sysUserDepts = sysUserDeptMapper.selectSysUserDeptList(sysUserDept);
sysUserDept.setDelFlag(0L);
sysUserDept.setDeptType("1");
@@ -482,6 +491,7 @@
SysUserDept sysUserDept = new SysUserDept();
sysUserDept.setUserId(user.getUserId());
sysUserDept.setDeptCode(wardCode);
+ sysUserDept.setDeptId(sysDept.getDeptId());
List<SysUserDept> sysUserDepts = sysUserDeptMapper.selectSysUserDeptList(sysUserDept);
sysUserDept.setDelFlag(0L);
sysUserDept.setDeptType("2");
--
Gitblit v1.9.3