diff --git a/aircraft-system/src/main/java/com/aircraft/modules/system/rest/UserController.java b/aircraft-system/src/main/java/com/aircraft/modules/system/rest/UserController.java index d026600..69acbbd 100644 --- a/aircraft-system/src/main/java/com/aircraft/modules/system/rest/UserController.java +++ b/aircraft-system/src/main/java/com/aircraft/modules/system/rest/UserController.java @@ -86,20 +86,7 @@ public class UserController { criteria.getDeptIds().addAll(deptService.getDeptChildren(data)); } // 数据权限 - List dataScopes = dataService.getDeptIds(userService.findByName(SecurityUtils.getCurrentUsername())); - // criteria.getDeptIds() 不为空并且数据权限不为空则取交集 - if (!CollectionUtils.isEmpty(criteria.getDeptIds()) && !CollectionUtils.isEmpty(dataScopes)){ - // 取交集 - criteria.getDeptIds().retainAll(dataScopes); - if(!CollectionUtil.isEmpty(criteria.getDeptIds())){ - return new ResponseEntity<>(userService.queryAll(criteria,page),HttpStatus.OK); - } - } else { - // 否则取并集 - criteria.getDeptIds().addAll(dataScopes); - return new ResponseEntity<>(userService.queryAll(criteria,page),HttpStatus.OK); - } - return new ResponseEntity<>(PageUtil.noData(),HttpStatus.OK); + return new ResponseEntity<>(userService.queryAll(criteria,page),HttpStatus.OK); } @Log("新增用户")