From 3bb54d86b0a80a13374b10b1a9d9d0f131a85f9d Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Mon, 16 Jul 2018 15:08:58 +0800
Subject: [PATCH] 大屏登录 返回地址信息完善
---
src/main/java/com/moral/controller/ScreenController.java | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index 8fd835e..6da7b44 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -11,6 +11,7 @@
import com.alibaba.fastjson.JSONReader;
import com.alibaba.fastjson.TypeReference;
+import com.moral.common.util.StringUtils;
import com.moral.entity.*;
import com.moral.entity.alarm.AlarmConfig;
import com.moral.entity.alarm.AlarmConfigValue;
@@ -124,11 +125,23 @@
Object orgId = resultMap.get("orgId");
if(resultMap.get("orgId")!=null && resultMap.get("orgId") instanceof Integer) {
Organization organization = organizationService.getOrganizationById((Integer) orgId);
+ StringBuilder areaNamesBuilder = new StringBuilder("������");
if( organization.getAreaNames()!=null){
AreaNames areaNames = organization.getAreaNames();
- resultMap.put("mapPath ","������/"+areaNames.getProvinceName()+"/"
- +areaNames.getCityName()+"/"+areaNames.getAreaName());
+ if(!StringUtils.isNullOrEmpty(areaNames.getProvinceName())){
+ areaNamesBuilder.append("/");
+ areaNamesBuilder.append(areaNames.getProvinceName());
+ if(!StringUtils.isNullOrEmpty(areaNames.getCityName())){
+ areaNamesBuilder.append("/");
+ areaNamesBuilder.append(areaNames.getCityName());
+ if(!StringUtils.isNullOrEmpty(areaNames.getAreaName())){
+ areaNamesBuilder.append("/");
+ areaNamesBuilder.append(areaNames.getAreaName());
+ }
+ }
+ }
}
+ resultMap.put("mapPath",areaNamesBuilder.toString());
}
}
return resultMap;
--
Gitblit v1.8.0