From a6ea3af4f8e917f1c19204bbaa5a75a4a86716ac Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Mon, 16 Jul 2018 14:57:38 +0800
Subject: [PATCH] 组织登录后 返回行政区信息 "中国/江苏省/苏州市/昆山市"
---
src/main/java/com/moral/controller/TestController.java | 1 -
src/main/java/com/moral/service/OrganizationService.java | 2 +-
src/main/java/com/moral/controller/OrganizationController.java | 2 +-
src/main/java/com/moral/service/impl/OrganizationServiceImpl.java | 2 +-
src/main/java/com/moral/controller/ScreenController.java | 11 +++++++++++
5 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/moral/controller/OrganizationController.java b/src/main/java/com/moral/controller/OrganizationController.java
index 334c2f4..039953d 100644
--- a/src/main/java/com/moral/controller/OrganizationController.java
+++ b/src/main/java/com/moral/controller/OrganizationController.java
@@ -42,7 +42,7 @@
@GetMapping("get-my-org")
public ResultBean<Organization> getMyOrganization(JwtAuthenticationToken token){
UserContext userContext = token.getPrincipal();
- Organization organization = organizationService.getOrganizationsById(userContext.getOrganizationId());
+ Organization organization = organizationService.getOrganizationById(userContext.getOrganizationId());
return new ResultBean<>(organization);
}
}
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index 759c759..8fd835e 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -103,6 +103,8 @@
private OrganizationLayoutService orgLayoutService;
@Resource
private DeviceVersionService dviceVersionService;
+ @Resource
+ private OrganizationService organizationService;
/**
* Screen login. ������������
*
@@ -119,6 +121,15 @@
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());
+ }
+ }
}
return resultMap;
}
diff --git a/src/main/java/com/moral/controller/TestController.java b/src/main/java/com/moral/controller/TestController.java
index 3cc23e4..50f2fb0 100644
--- a/src/main/java/com/moral/controller/TestController.java
+++ b/src/main/java/com/moral/controller/TestController.java
@@ -16,7 +16,6 @@
@RequestMapping("/hello")
public String hello() {
-
return "Hello World";
}
diff --git a/src/main/java/com/moral/service/OrganizationService.java b/src/main/java/com/moral/service/OrganizationService.java
index e210565..4c3cb5e 100644
--- a/src/main/java/com/moral/service/OrganizationService.java
+++ b/src/main/java/com/moral/service/OrganizationService.java
@@ -20,5 +20,5 @@
public void deleteByIds(Integer... ids);
List<Organization> getOrganizationsByName(String name);
- public Organization getOrganizationsById(int id);
+ public Organization getOrganizationById(int id);
}
diff --git a/src/main/java/com/moral/service/impl/OrganizationServiceImpl.java b/src/main/java/com/moral/service/impl/OrganizationServiceImpl.java
index 3b24c86..29a321f 100644
--- a/src/main/java/com/moral/service/impl/OrganizationServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/OrganizationServiceImpl.java
@@ -120,7 +120,7 @@
}
@Override
- public Organization getOrganizationsById(int id) {
+ public Organization getOrganizationById(int id) {
Example example = new Example(ENTITY_CLASS);
example.or().andEqualTo("id",id);
List<Organization> organizationList = organizationMapper.selectWithAreaNameByExample(example);
--
Gitblit v1.8.0