From f59f88beccf035b5804e99ec699e0de525e9b7d2 Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Wed, 5 Jul 2017 11:37:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=BA=E5=88=86=E5=B8=B8=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/lyms/platform/operate/web/facade/BasicConfigFacade.java  | 3 ++-
 .../com/lyms/platform/operate/web/result/BasicConfigResult.java  | 9 +++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java
index 702b7ed..cc12981 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java
@@ -191,6 +191,7 @@ public class BasicConfigFacade {
         List<BasicConfig> datas = basicConfigService.queryBasicConfig(basicConfigQuery);
         List<BasicConfigResult> configResults = new ArrayList<>();
         if (datas != null) {
+           BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(parentId);
             for (BasicConfig data : datas) {
                 BasicConfigResult br = new BasicConfigResult();
                 br.setId(data.getId());
@@ -199,7 +200,7 @@ public class BasicConfigFacade {
                 br.setName(data.getName());
                 br.setParentId(data.getParentId());
                 br.setWeight(data.getWeight());
-
+                br.setParentName(null==basicConfig?"":basicConfig.getName());
                 configResults.add(br);
             }
         }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BasicConfigResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BasicConfigResult.java
index 874f7c0..5551b82 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BasicConfigResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BasicConfigResult.java
@@ -11,12 +11,21 @@ public class BasicConfigResult  implements IBasicResultConvert<BasicConfigResult
     private int enable;
     private String parentId;
     private String name;
+    private String parentName;
     private String desc;
     //权重
     private Integer weight;
 
     private List leastUse;
 
+    public String getParentName() {
+        return parentName;
+    }
+
+    public void setParentName(String parentName) {
+        this.parentName = parentName;
+    }
+
     public List getLeastUse() {
         return leastUse;
     }
-- 
1.8.3.1