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 f7364fc9..9df05228 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 @@ -177,13 +177,13 @@ public class DepartmentQueryExe { //按照企业分组 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); +// Map> corpMap = examCenterCOS.stream().collect(Collectors.groupingBy(DepartmentTreeInfoCO::getCorpinfoId)); +// corpMap.forEach((corpId, list) -> { + List departmentTreeInfoCOS = Tools.buildEntityTree(examCenterCOS, "id", "parentId", "childrenList", 0L); if(CollUtil.isNotEmpty(departmentTreeInfoCOS)){ result2.addAll(departmentTreeInfoCOS); } - }); +// }); return result2; } diff --git a/web-infrastructure/src/main/resources/mapper/DepartmentMapper.xml b/web-infrastructure/src/main/resources/mapper/DepartmentMapper.xml index 3fb3e5fb..30f8765b 100644 --- a/web-infrastructure/src/main/resources/mapper/DepartmentMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/DepartmentMapper.xml @@ -24,7 +24,7 @@ #{item} - order by d.dep_order, d.create_time desc + order by c.corp_order, c.create_time desc,d.dep_order, d.create_time desc