优化 代码

java110-bean/src/main/java/com/java110/dto/org/OrgTreeDto.java

@@ -22,16 +22,18 @@ public class OrgTreeDto implements Serializable {
 
     }
 
-    public OrgTreeDto(String id, String text,String parentId) {
+    public OrgTreeDto(String id, String text,String parentId,String allOrgName) {
         this.id = id;
         this.text = text;
         this.parentId = parentId;
+        this.allOrgName = allOrgName;
     }
 
     private String id;
     private String icon ="/img/org.png";
     private String text;
     private String parentId;
+    private String allOrgName;
     private List<OrgTreeDto> children;
 
 
@@ -74,4 +76,12 @@ public class OrgTreeDto implements Serializable {
     public void setParentId(String parentId) {
         this.parentId = parentId;
     }
+
+    public String getAllOrgName() {
+        return allOrgName;
+    }
+
+    public void setAllOrgName(String allOrgName) {
+        this.allOrgName = allOrgName;
+    }
 }

service-user/src/main/java/com/java110/user/cmd/org/ListOrgTreeCmd.java

@@ -50,7 +50,7 @@ public class ListOrgTreeCmd extends Cmd {
         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 @@ public class ListOrgTreeCmd extends Cmd {
         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 + " / " + orgDto.getOrgName());
                 childs.add(child);
             }
         }