From 4bfbcdb7ab58cf472dccd6657ceb88303c9d9638 Mon Sep 17 00:00:00 2001 From: zhaokai Date: Thu, 20 Nov 2025 11:21:16 +0800 Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E9=97=A8=E8=B0=83=E6=95=B4=E7=88=B6?= =?UTF-8?q?=E9=83=A8=E9=97=A8=E6=98=AF0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/info/command/query/DepartmentQueryExe.java | 10 ++++++++-- .../zcloud/basic/info/domain/model/DepartmentE.java | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) 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 fc5763e..55feb99 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 @@ -81,7 +81,13 @@ public class DepartmentQueryExe { } List examCenterCOS = departmentCoConvertor.converDOsToInfoCOs(pageResponse); //GBS部门根节点父部门是tenantId - return Tools.buildEntityTree(examCenterCOS, "id", "parentId", "childrenList", departmentQry.getEqCorpinfoId()); + if(departmentQry.getEqParentId()!=null){ + return Tools.buildEntityTree(examCenterCOS, "id", "parentId", "childrenList",departmentQry.getEqParentId()); + + }else{ + return Tools.buildEntityTree(examCenterCOS, "id", "parentId", "childrenList",0L); + + } } @@ -140,7 +146,7 @@ public class DepartmentQueryExe { List> result1= new ArrayList<>(); Map> corpMap = examCenterCOS.stream().collect(Collectors.groupingBy(DepartmentTreeInfoCO::getCorpinfoId)); corpMap.forEach((corpId, list) -> { - List departmentTreeInfoCOS = Tools.buildEntityTree(list, "id", "parentId", "childrenList", corpId); + List departmentTreeInfoCOS = Tools.buildEntityTree(list, "id", "parentId", "childrenList", 0L); result1.add(departmentTreeInfoCOS); }); diff --git a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/DepartmentE.java b/web-domain/src/main/java/com/zcloud/basic/info/domain/model/DepartmentE.java index 33388e8..27fc9c3 100644 --- a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/DepartmentE.java +++ b/web-domain/src/main/java/com/zcloud/basic/info/domain/model/DepartmentE.java @@ -62,7 +62,7 @@ public class DepartmentE extends BaseE { public void initCorpInfo(Long corpInfoId, String corpName) { this.setId(corpInfoId); this.setCorpinfoId(corpInfoId); - this.setParentId(corpInfoId); + this.setParentId(0L); this.setTenantId(corpInfoId); this.setOrgId(corpInfoId); this.setName(corpName);