root/rongLiJiaNai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 用户管理显示问题

Browse Source
This commit is contained in:
liyongde
2023-05-18 16:11:00 +08:00
parent 5e28c18ad1
commit 065f4794ec
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
wms/hd/nladmin-system/src/main/java/org/nl/modules/system/rest/UserController.java
View File

@@ -31,6 +31,7 @@ import org.nl.modules.system.service.dto.UserQueryCriteria;
import org.nl.utils.PageUtil; import org.nl.utils.PageUtil;
import org.nl.utils.RsaUtils; import org.nl.utils.RsaUtils;
import org.nl.common.utils.UserInfoUtil; import org.nl.common.utils.UserInfoUtil;
import org.nl.utils.SecurityUtils;
import org.nl.utils.enums.CodeEnum; import org.nl.utils.enums.CodeEnum;
import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
@@ -83,7 +84,7 @@ public class UserController {
criteria.getDeptIds().addAll(deptService.getDeptChildren(deptService.findByPid(criteria.getDeptId()))); criteria.getDeptIds().addAll(deptService.getDeptChildren(deptService.findByPid(criteria.getDeptId())));
} }
// 数据权限 // 数据权限
List<Long> dataScopes = dataService.getDeptIds(userService.findByName(UserInfoUtil.getNickName())); List<Long> dataScopes = dataService.getDeptIds(userService.findByName(SecurityUtils.getCurrentUsername()));
// criteria.getDeptIds() 不为空并且数据权限不为空则取交集 // criteria.getDeptIds() 不为空并且数据权限不为空则取交集
if (!CollectionUtils.isEmpty(criteria.getDeptIds()) && !CollectionUtils.isEmpty(dataScopes)){ if (!CollectionUtils.isEmpty(criteria.getDeptIds()) && !CollectionUtils.isEmpty(dataScopes)){
// 取交集 // 取交集