From b95fd235f28073131ffc4b9417219bdd576d3c7c Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Mon, 16 Jul 2018 15:26:49 +0800
Subject: [PATCH] 大屏登录 返回地址信息,超级管理员组织，返回 中国
---
src/main/java/com/moral/controller/ScreenController.java | 30 ++++++++++++++++++++++++------
1 files changed, 24 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index 8fd835e..a78ff3d 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;
@@ -105,6 +106,8 @@
private DeviceVersionService dviceVersionService;
@Resource
private OrganizationService organizationService;
+ @Resource
+ private DictionaryDataService dictionaryDataService;
/**
* Screen login. ������������
*
@@ -121,14 +124,29 @@
resultMap.put("accountId", -1);
} else {
resultMap = accountService.screenLogin(parameters);
+ // ������������������������������������������
Object orgId = resultMap.get("orgId");
if(resultMap.get("orgId")!=null && resultMap.get("orgId") instanceof Integer) {
- Organization organization = organizationService.getOrganizationById((Integer) orgId);
- if( organization.getAreaNames()!=null){
- AreaNames areaNames = organization.getAreaNames();
- resultMap.put("mapPath ","������/"+areaNames.getProvinceName()+"/"
- +areaNames.getCityName()+"/"+areaNames.getAreaName());
- }
+ StringBuilder areaNamesBuilder = new StringBuilder("������");
+ if((Integer) orgId != dictionaryDataService.querySupperOrgId()) {
+ Organization organization = organizationService.getOrganizationById((Integer) orgId);
+ if(organization.getAreaNames()!=null){
+ AreaNames areaNames = organization.getAreaNames();
+ 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