From 907641e56c2085aaa81f267946dc3e3e9fca73e7 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 18 九月 2024 09:39:02 +0800
Subject: [PATCH] 代码提交
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java | 29 ++++++++++++++++++++++++++---
1 files changed, 26 insertions(+), 3 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 79df621..4d3edcd 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
@@ -113,8 +113,31 @@
for (SysDept sysDept : sysDepts) {
deptIds.add(sysDept.getDeptId());
}
+ SysUserDept sysUserDept = new SysUserDept();
+ sysUserDept.setUserId(sysUser.getUserId());
+ sysUserDept.setDeptType(sysUser.getSearchscope());
+ List<SysUserDept> sysUserDeptKSs = null;
+ List<SysUserDept> sysUserDeptBQs = null;
+ if (StringUtils.isNotEmpty(sysUser.getSearchscope()) && sysUser.getSearchscope().equals("0")) {
+ sysUserDept.setDeptType("1");
+ sysUserDeptKSs = sysUserDeptMapper.selectSysUserDeptList(sysUserDept);
+ sysUserDept.setDeptType("2");
+ sysUserDeptBQs = sysUserDeptMapper.selectSysUserDeptList(sysUserDept);
+ } else if (StringUtils.isNotEmpty(sysUser.getSearchscope()) && sysUser.getSearchscope().equals("1")) {
+ sysUserDept.setDeptType("1");
+ sysUserDeptKSs = sysUserDeptMapper.selectSysUserDeptList(sysUserDept);
+ } else if (StringUtils.isNotEmpty(sysUser.getSearchscope()) && sysUser.getSearchscope().equals("2")) {
+ sysUserDept.setDeptType("2");
+ sysUserDeptBQs = sysUserDeptMapper.selectSysUserDeptList(sysUserDept);
+ }
+
sysUser.setDepts(deptIds);
- return userMapper.selectUserByUserName(userName);
+ if (!CollectionUtils.isEmpty(sysUserDeptBQs))
+ sysUser.setLeavehospitaldistrictcodes(sysUserDeptBQs.stream().map(SysUserDept::getDeptCode).collect(Collectors.toList()));
+ if (!CollectionUtils.isEmpty(sysUserDeptKSs))
+ sysUser.setLeaveldeptcodes(sysUserDeptKSs.stream().map(SysUserDept::getDeptCode).collect(Collectors.toList()));
+
+ return sysUser;
}
/**
@@ -305,7 +328,7 @@
//鏂板鐢ㄦ埛涓庨儴闂ㄥ叧鑱�
sysUserDeptMapper.deleteSysUserDeptByIds(ids);
if (!CollectionUtils.isEmpty(user.getDepts())) {
- for ( Long deptId: user.getDepts()) {
+ for (Long deptId : user.getDepts()) {
SysUserDept sysUserDep = new SysUserDept();
sysUserDep.setUserId(user.getUserId());
sysUserDep.setDeptId(deptId);
@@ -321,7 +344,7 @@
sysUserDep.setUpdateTime(new Date());
sysUserDeptMapper.insertSysUserDept(sysUserDep);
}
- }else {
+ } else {
}
return userMapper.updateUser(user);
--
Gitblit v1.9.3