From adc1333672f9fb31bd19cc847c23be8f4d51adb7 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Thu, 27 Sep 2018 12:05:26 +0800
Subject: [PATCH] 大屏 path 更新

---
 src/main/java/com/moral/controller/ScreenController.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index b3a2be2..2894cdc 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -149,7 +149,7 @@
 							areaNamesBuilder.append(String.join("/",names));
 						}
 					// ������������
-					if( 0 == organization.getRank()) {
+					if(organization.getRank()!=null && organization.getRank() == 0) {
 						resultMap.put("type","enterprise");
                     }else{
 						resultMap.put("type","government");
@@ -166,7 +166,7 @@
 					}else if(organization.getProvinceCode()!=null) {
 						mapAreaCode  = organization.getProvinceCode();
 					}
-					resultMap.put("mapAreaCode ",mapAreaCode.toString() );
+					resultMap.put("mapAreaCode",mapAreaCode.toString() );
                 }
                 resultMap.put("mapPath",areaNamesBuilder.toString());
             }

--
Gitblit v1.8.0