From ae086bc3ad6f785e6368b84e57a7e199c675779b Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 02 四月 2025 11:42:28 +0800
Subject: [PATCH] 代码提交
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java | 7 +++++--
1 files changed, 5 insertions(+), 2 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..e71efa3 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
@@ -161,6 +161,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();
@@ -192,7 +193,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 +203,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 +227,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 +240,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);
--
Gitblit v1.9.3