From 639b955caedd53a5dddfe9eb3df0e2ecb0c5aac2 Mon Sep 17 00:00:00 2001
From: yangfei <yangfei@lymsh.com>
Date: Fri, 25 May 2018 14:50:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=99=9A=E4=B8=8A=E8=AF=8A=E6=96=AD=E7=BB=93?=
 =?UTF-8?q?=E6=9E=9C=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform/operate/web/facade/ViewFacade.java    | 26 ++++++++++++----------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
index ab736b6..af47a45 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
@@ -312,21 +312,23 @@ public class ViewFacade {
     }
 
     private void getscreenResult(List<String> screenResult, Map<String, Object> map) {
-        BasicConfigQuery basicConfigQuery = new BasicConfigQuery();
-        List<Map<String, Object>> list = new ArrayList<>();
-        for(String scr:screenResult){
-            basicConfigQuery.setId(scr);
-            List<BasicConfig> basicConfigs = basicConfigService.queryBasicConfig(basicConfigQuery);
-            if (CollectionUtils.isNotEmpty(basicConfigs)) {
-                for (BasicConfig basicConfig : basicConfigs) {
-                    Map<String, Object> scrMap = new HashMap<>();
-                    scrMap.put("id", basicConfig.getId());
-                    scrMap.put("name", basicConfig.getName());
-                    list.add(scrMap);
+        if(CollectionUtils.isNotEmpty(screenResult)){
+            BasicConfigQuery basicConfigQuery = new BasicConfigQuery();
+            List<Map<String, Object>> list = new ArrayList<>();
+            for(String scr:screenResult){
+                basicConfigQuery.setId(scr);
+                List<BasicConfig> basicConfigs = basicConfigService.queryBasicConfig(basicConfigQuery);
+                if (CollectionUtils.isNotEmpty(basicConfigs)) {
+                    for (BasicConfig basicConfig : basicConfigs) {
+                        Map<String, Object> scrMap = new HashMap<>();
+                        scrMap.put("id", basicConfig.getId());
+                        scrMap.put("name", basicConfig.getName());
+                        list.add(scrMap);
+                    }
                 }
             }
+            map.put("screenResult", list);
         }
-        map.put("screenResult", list);
     }
 
     /**
-- 
1.8.3.1