From f6505b1093e3477e39cc74a8c040bd29fe66cd62 Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Mon, 25 Apr 2016 14:29:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lyms/platform/operate/web/facade/BasicConfigFacade.java    | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

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 2a55b58..73496fd 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
@@ -101,10 +101,12 @@ public class BasicConfigFacade {
     public List<TreeNode> findAllBasicConfigWithTree() {
         List<TreeNode> list = new ArrayList<TreeNode>();
         List<BasicConfig> l = basicConfigService.queryParentConfig();
-        for (BasicConfig b : l) {
-            TreeNode node = TreeHelper.recursiveTree(b, basicConfigService);
-            if (null != node) {
-                list.add(node);
+        if(CollectionUtils.isNotEmpty(l)){
+            for (BasicConfig b : l) {
+                TreeNode node = TreeHelper.recursiveTree(b, basicConfigService);
+                if (null != node) {
+                    list.add(node);
+                }
             }
         }
         return list;
-- 
1.8.3.1