From 4e124bbb3e96afe124a6bf47beef7804c3cecb68 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 18 八月 2022 14:56:53 +0800
Subject: [PATCH] 修改密码 加入演示环境判断
---
service-user/src/main/java/com/java110/user/cmd/org/ListOrgTreeCmd.java | 6 +++---
1 files changed, 3 insertions(+), 3 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 298c5bc..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,11 +68,11 @@
List<OrgTreeDto> childs = new ArrayList<>();
OrgTreeDto child = null;
for (OrgDto orgDto : orgDtos) {
- if(parentOrgDto.getId().equals(orgDto.getOrgId())){ // 浠栬嚜宸辫烦杩�
+ 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