From 3a697927714d9f35042d4b246366519e3debca16 Mon Sep 17 00:00:00 2001
From: landong2015 <hanshaofeng@lymsh.com>
Date: Wed, 18 Jan 2017 17:38:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=9D=E8=AF=8A=E9=AB=98?=
 =?UTF-8?q?=E5=8D=B1=E5=9B=A0=E7=B4=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform/operate/web/facade/ViewFacade.java    | 53 +++++++++++-----------
 1 file changed, 27 insertions(+), 26 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 9e25ab7..51243e5 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
@@ -160,38 +160,39 @@ public class ViewFacade {
             }
         }
         Integer score = 0;
-        if (highScoreResult.getScore()!=null){
-            score = highScoreResult.getScore();
-        }
-
-        List<Map<String, Object>> list = ResolveUtils.queryHighRisk(highScoreResult);
+        if (highScoreResult!=null){
+            if (highScoreResult.getScore()!=null){
+                score = highScoreResult.getScore();
+            }
+            List<Map<String, Object>> list = ResolveUtils.queryHighRisk(highScoreResult);
 
-        Map<String,Object> otherRisk = null;
-        if (StringUtils.isNotEmpty(oRisk) && !"{}".equals(oRisk)){
-            otherRisk = new HashMap<>();
-            ResolveUtils.queryOtherRisk(oRisk,otherRisk,basicConfigService);
-        }
+            Map<String,Object> otherRisk = null;
+            if (StringUtils.isNotEmpty(oRisk) && !"{}".equals(oRisk)){
+                otherRisk = new HashMap<>();
+                ResolveUtils.queryOtherRisk(oRisk,otherRisk,basicConfigService);
+            }
 
-        Map<String,Object> otherMap = new HashMap<>();
+            Map<String,Object> otherMap = new HashMap<>();
 
-        if (otherRisk!=null){
-            if (otherRisk.get("name")!=null){
-                otherMap.put("name",otherRisk.get("name"));
-            }
-            if (otherRisk.get("color")!=null){
-                otherMap.put("color",otherRisk.get("color"));
-            }
-            if (otherRisk.get("score")!=null){
-                String s = (String)otherRisk.get("score");
-                if (FunvCommonUtil.isNumeric(s)){
-                    score = score + Integer.parseInt(s);
+            if (otherRisk!=null){
+                if (otherRisk.get("name")!=null){
+                    otherMap.put("name",otherRisk.get("name"));
+                }
+                if (otherRisk.get("color")!=null){
+                    otherMap.put("color",otherRisk.get("color"));
+                }
+                if (otherRisk.get("score")!=null){
+                    String s = (String)otherRisk.get("score");
+                    if (FunvCommonUtil.isNumeric(s)){
+                        score = score + Integer.parseInt(s);
+                    }
                 }
+                list.add(otherMap);
             }
-            list.add(otherMap);
-        }
 
-        map.put("score",UnitUtils.unitSplice(score,UnitConstants.FEN));
-        map.put("highRisk",list);
+            map.put("score",UnitUtils.unitSplice(score,UnitConstants.FEN));
+            map.put("highRisk",list);
+        }
     }
 
 
-- 
1.8.3.1