From 2a4e8387ebce7c0b20a69e9d0b1bda86c57a76fe Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 16 八月 2022 13:48:02 +0800
Subject: [PATCH] 优化代码
---
service-user/src/main/java/com/java110/user/cmd/org/ListOrgTreeCmd.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/cmd/org/ListOrgTreeCmd.java b/service-user/src/main/java/com/java110/user/cmd/org/ListOrgTreeCmd.java
index 65fd7bc..607403f 100644
--- a/service-user/src/main/java/com/java110/user/cmd/org/ListOrgTreeCmd.java
+++ b/service-user/src/main/java/com/java110/user/cmd/org/ListOrgTreeCmd.java
@@ -50,7 +50,7 @@
OrgTreeDto storeOrgTreeDto = null;
for (OrgDto tmpOrgDto : orgDtos) {
if (OrgDto.ORG_LEVEL_STORE.equals(tmpOrgDto.getOrgLevel())) {
- storeOrgTreeDto = new OrgTreeDto(tmpOrgDto.getOrgId(), tmpOrgDto.getOrgName(), tmpOrgDto.getParentOrgId());
+ storeOrgTreeDto = new OrgTreeDto(tmpOrgDto.getOrgId(), tmpOrgDto.getOrgName(), tmpOrgDto.getParentOrgId(), tmpOrgDto.getOrgName());
}
}
@@ -68,8 +68,11 @@
List<OrgTreeDto> childs = new ArrayList<>();
OrgTreeDto child = null;
for (OrgDto orgDto : orgDtos) {
+ if (parentOrgDto.getId().equals(orgDto.getOrgId())) { // 浠栬嚜宸辫烦杩�
+ continue;
+ }
if (orgDto.getParentOrgId().equals(parentOrgDto.getId())) {
- child = new OrgTreeDto(orgDto.getOrgId(), orgDto.getOrgName(), orgDto.getParentOrgId());
+ child = new OrgTreeDto(orgDto.getOrgId(), orgDto.getOrgName(), orgDto.getParentOrgId(), parentOrgDto.getAllOrgName() + " / " + orgDto.getOrgName());
childs.add(child);
}
}
--
Gitblit v1.8.0