From 6f7ddcb14a6ba8de79c1627a5a49ca696e615819 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Tue, 31 Jul 2018 17:51:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=84=BF=E7=AB=A5=E6=A3=80=E6=9F=A5=E6=9C=88?=
 =?UTF-8?q?=E9=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform/operate/web/facade/ViewFacade.java    | 25 ++++++++++++----------
 1 file changed, 14 insertions(+), 11 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 8856d9c..504cf93 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
@@ -5044,13 +5044,13 @@ public class ViewFacade {
 
         if (CollectionUtils.isNotEmpty(screens))
         {
-
+            String screenName = "";
             for (int i = 0 ;i < screens.size() ; i++) {
                 Map<String, String> rmap = (Map<String, String>) screens.get(i);
-                String screenName = rmap.get("name");
-                Element nElement = checkElement.addElement("screenName");
-                nElement.addText(screenName);
+                screenName+=rmap.get("name") + (i == screens.size() - 1 ? "": ",");
             }
+            Element nElement = checkElement.addElement("screenName");
+            nElement.addText(screenName);
         }
 
         Element resultSuppleElement = checkElement.addElement("resultSupple");
@@ -5069,6 +5069,9 @@ public class ViewFacade {
         List riskList = (List)map.get("highRisk");
         if (CollectionUtils.isNotEmpty(riskList))
         {
+            String name = "";
+            String riskColor = "";
+
             for (int i = 0 ;i < riskList.size() ; i++)
             {
                 Map<String, String> rmap  = (Map<String, String>) riskList.get(i);
@@ -5093,15 +5096,15 @@ public class ViewFacade {
                 {
                     color = "紫色";
                 }
-                //Element riskFactorElement = checkElement.addElement("riskFactor");
+                riskColor+=color + (i == screens.size() - 1 ? "": ",");;
+                name+=rmap.get("name")+ (i == screens.size() - 1 ? "": ",");
+            }
 
-                String name = rmap.get("name");
-                Element nElement = checkElement.addElement("riskName");
-                nElement.addText(name);
+            Element nElement = checkElement.addElement("riskName");
+            nElement.addText(name);
 
-                Element colorElement = checkElement.addElement("color");
-                colorElement.addText(color);
-            }
+            Element colorElement = checkElement.addElement("color");
+            colorElement.addText(riskColor);
         }
     }
 }
-- 
1.8.3.1