From 065f4794ececabde8d6c44637eef6fef53baf7d9 Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Thu, 18 May 2023 16:11:00 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/org/nl/modules/system/rest/UserController.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/modules/system/rest/UserController.java b/wms/hd/nladmin-system/src/main/java/org/nl/modules/system/rest/UserController.java index 9fbbc07..8ced14c 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/modules/system/rest/UserController.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/modules/system/rest/UserController.java @@ -31,6 +31,7 @@ import org.nl.modules.system.service.dto.UserQueryCriteria; import org.nl.utils.PageUtil; import org.nl.utils.RsaUtils; import org.nl.common.utils.UserInfoUtil; +import org.nl.utils.SecurityUtils; import org.nl.utils.enums.CodeEnum; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; @@ -83,7 +84,7 @@ public class UserController { criteria.getDeptIds().addAll(deptService.getDeptChildren(deptService.findByPid(criteria.getDeptId()))); } // 数据权限 - List dataScopes = dataService.getDeptIds(userService.findByName(UserInfoUtil.getNickName())); + List dataScopes = dataService.getDeptIds(userService.findByName(SecurityUtils.getCurrentUsername())); // criteria.getDeptIds() 不为空并且数据权限不为空则取交集 if (!CollectionUtils.isEmpty(criteria.getDeptIds()) && !CollectionUtils.isEmpty(dataScopes)){ // 取交集