refactor:delete param Long deptId of deptService.getDeptChildren (elunez#525)

jiefei30 · web-flow · commit aab6beffc053 · 2020-11-15T19:40:24.000+08:00
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
@@ -79,8 +79,7 @@ public void download(HttpServletResponse response, UserQueryCriteria criteria) t
     public ResponseEntity<Object> 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<Long> 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
@@ -111,11 +111,10 @@ public interface DeptService {
 
     /**
      * 获取
-     * @param deptId
      * @param deptList
      * @return
      */
-    List<Long> getDeptChildren(Long deptId, List<Dept> deptList);
+    List<Long> getDeptChildren(List<Dept> 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
@@ -83,7 +83,7 @@ public Set<Long> getCustomize(Set<Long> deptIds, RoleSmallDto role){
             deptIds.add(dept.getId());
             List<Dept> 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
@@ -172,13 +172,13 @@ public Set<DeptDto> getDeleteDepts(List<Dept> menuList, Set<DeptDto> deptDtos) {
     }
 
     @Override
-    public List<Long> getDeptChildren(Long deptId, List<Dept> deptList) {
+    public List<Long> getDeptChildren(List<Dept> deptList) {
         List<Long> list = new ArrayList<>();
         deptList.forEach(dept -> {
-                    if (dept!=null && dept.getEnabled()){
+                    if (dept!=null && dept.getEnabled()) {
                         List<Dept> 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());
                     }

Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ public Set<Long> getCustomize(Set<Long> deptIds, RoleSmallDto role){`
`83`	`83`	`deptIds.add(dept.getId());`
`84`	`84`	`List<Dept> deptChildren = deptService.findByPid(dept.getId());`
`85`	`85`	`if (deptChildren != null && deptChildren.size() != 0) {`
`86`		`- deptIds.addAll(deptService.getDeptChildren(dept.getId(), deptChildren));`
	`86`	`+ deptIds.addAll(deptService.getDeptChildren(deptChildren));`
`87`	`87`	`}`
`88`	`88`	`}`
`89`	`89`	`return deptIds;`
Original file line number	Diff line number	Diff line change
`@@ -172,13 +172,13 @@ public Set<DeptDto> getDeleteDepts(List<Dept> menuList, Set<DeptDto> deptDtos) {`
`172`	`172`	`}`
`173`	`173`
`174`	`174`	`@Override`
`175`		`- public List<Long> getDeptChildren(Long deptId, List<Dept> deptList) {`
	`175`	`+ public List<Long> getDeptChildren(List<Dept> deptList) {`
`176`	`176`	`List<Long> list = new ArrayList<>();`
`177`	`177`	`deptList.forEach(dept -> {`
`178`		`- if (dept!=null && dept.getEnabled()){`
	`178`	`+ if (dept!=null && dept.getEnabled()) {`
`179`	`179`	`List<Dept> depts = deptRepository.findByPid(dept.getId());`
`180`		`- if(deptList.size() != 0){`
`181`		`- list.addAll(getDeptChildren(dept.getId(), depts));`
	`180`	`+ if (deptList.size() != 0) {`
	`181`	`+ list.addAll(getDeptChildren(depts));`
`182`	`182`	`}`
`183`	`183`	`list.add(dept.getId());`
`184`	`184`	`}`