From aab6beffc053558faaaa28cbe1f92402fa3dc49f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=9A=86=E9=9D=9E?= <53246310+jie-fei30@users.noreply.github.com> Date: Sun, 15 Nov 2020 19:40:24 +0800 Subject: [PATCH] refactor:delete param Long deptId of deptService.getDeptChildren (#525) --- .../me/zhengjie/modules/system/rest/UserController.java | 3 +-- .../me/zhengjie/modules/system/service/DeptService.java | 3 +-- .../modules/system/service/impl/DataServiceImpl.java | 2 +- .../modules/system/service/impl/DeptServiceImpl.java | 8 ++++---- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/UserController.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/UserController.java index c79b2245..df326f90 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/UserController.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/UserController.java @@ -79,8 +79,7 @@ public class UserController { public ResponseEntity query(UserQueryCriteria criteria, Pageable pageable){ if (!ObjectUtils.isEmpty(criteria.getDeptId())) { criteria.getDeptIds().add(criteria.getDeptId()); - criteria.getDeptIds().addAll(deptService.getDeptChildren(criteria.getDeptId(), - deptService.findByPid(criteria.getDeptId()))); + criteria.getDeptIds().addAll(deptService.getDeptChildren(deptService.findByPid(criteria.getDeptId()))); } // 数据权限 List dataScopes = dataService.getDeptIds(userService.findByName(SecurityUtils.getCurrentUsername())); diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/DeptService.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/DeptService.java index ae1b6672..d589bf88 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/DeptService.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/DeptService.java @@ -111,11 +111,10 @@ public interface DeptService { /** * 获取 - * @param deptId * @param deptList * @return */ - List getDeptChildren(Long deptId, List deptList); + List getDeptChildren(List deptList); /** * 验证是否被角色或用户关联 diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DataServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DataServiceImpl.java index 5e3d541d..33a81480 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DataServiceImpl.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DataServiceImpl.java @@ -83,7 +83,7 @@ public class DataServiceImpl implements DataService { deptIds.add(dept.getId()); List deptChildren = deptService.findByPid(dept.getId()); if (deptChildren != null && deptChildren.size() != 0) { - deptIds.addAll(deptService.getDeptChildren(dept.getId(), deptChildren)); + deptIds.addAll(deptService.getDeptChildren(deptChildren)); } } return deptIds; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DeptServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DeptServiceImpl.java index ac2bcbe2..1fc7dfef 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DeptServiceImpl.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DeptServiceImpl.java @@ -172,13 +172,13 @@ public class DeptServiceImpl implements DeptService { } @Override - public List getDeptChildren(Long deptId, List deptList) { + public List getDeptChildren(List deptList) { List list = new ArrayList<>(); deptList.forEach(dept -> { - if (dept!=null && dept.getEnabled()){ + if (dept!=null && dept.getEnabled()) { List depts = deptRepository.findByPid(dept.getId()); - if(deptList.size() != 0){ - list.addAll(getDeptChildren(dept.getId(), depts)); + if (deptList.size() != 0) { + list.addAll(getDeptChildren(depts)); } list.add(dept.getId()); }