diff --git a/web-adapter/src/main/java/com/zcloud/basic/info/web/DepartmentController.java b/web-adapter/src/main/java/com/zcloud/basic/info/web/DepartmentController.java index 91ceff6..2ae0f5b 100644 --- a/web-adapter/src/main/java/com/zcloud/basic/info/web/DepartmentController.java +++ b/web-adapter/src/main/java/com/zcloud/basic/info/web/DepartmentController.java @@ -92,7 +92,7 @@ public class DepartmentController { } @ApiOperation("所有企业下部门树状所有数据") @PostMapping("/listAllTree") - public MultiResponse> listAllTree() { + public MultiResponse listAllTree() { return MultiResponse.of(departmentService.listAllTree()); } diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/query/DepartmentQueryExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/query/DepartmentQueryExe.java index a5007e3..d911e3e 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/query/DepartmentQueryExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/query/DepartmentQueryExe.java @@ -144,7 +144,7 @@ public class DepartmentQueryExe { return departmentCoConvertor.converDOsToCOs(list); } - public Collection> listAllTree() { + public List listAllTree() { List pageResponse = departmentRepository.listAllTree(); if (CollUtil.isEmpty(pageResponse)) { @@ -160,16 +160,17 @@ public class DepartmentQueryExe { //GBS部门根节点父部门是tenantId //按照企业分组 List> result1= new ArrayList<>(); + List result2= new ArrayList<>(); Map> corpMap = examCenterCOS.stream().collect(Collectors.groupingBy(DepartmentTreeInfoCO::getCorpinfoId)); corpMap.forEach((corpId, list) -> { List departmentTreeInfoCOS = Tools.buildEntityTree(list, "id", "parentId", "childrenList", 0L); if(CollUtil.isNotEmpty(departmentTreeInfoCOS)){ - result1.add(departmentTreeInfoCOS); + result2.addAll(departmentTreeInfoCOS); } }); - return result1; + return result2; } } diff --git a/web-app/src/main/java/com/zcloud/basic/info/service/DepartmentServiceImpl.java b/web-app/src/main/java/com/zcloud/basic/info/service/DepartmentServiceImpl.java index 8b8b391..b27c5ff 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/service/DepartmentServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/basic/info/service/DepartmentServiceImpl.java @@ -83,7 +83,7 @@ public class DepartmentServiceImpl implements DepartmentServiceI { } @Override - public Collection> listAllTree() { + public List listAllTree() { return departmentQueryExe.listAllTree(); } } diff --git a/web-client/src/main/java/com/zcloud/basic/info/api/DepartmentServiceI.java b/web-client/src/main/java/com/zcloud/basic/info/api/DepartmentServiceI.java index 0d4b701..c49c5ba 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/api/DepartmentServiceI.java +++ b/web-client/src/main/java/com/zcloud/basic/info/api/DepartmentServiceI.java @@ -36,6 +36,6 @@ public interface DepartmentServiceI { List getDeptList(); - Collection> listAllTree(); + List listAllTree(); }