From cb0f82d6e1143972ef00925209bd45763ee472b3 Mon Sep 17 00:00:00 2001
From: "rui.zhang" <zhangrui@lymsh.com>
Date: Tue, 3 May 2016 20:44:50 +0800
Subject: [PATCH] =?UTF-8?q?platform=20permission=20=20=20=20=20=20=20=20?=
 =?UTF-8?q?=E6=9C=BA=E6=9E=84=E5=9C=B0=E5=9D=80=E4=BF=A1=E6=81=AF=E5=AE=8C?=
 =?UTF-8?q?=E6=95=B4=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/lyms/platform/pojo/CommunityConfig.java    |  9 +++++++
 .../web/controller/CommunityConfigController.java  |  5 ++++
 .../web/controller/OrganizationController.java     | 29 ++++++++++++++++++++++
 3 files changed, 43 insertions(+)

diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/CommunityConfig.java b/platform-dal/src/main/java/com/lyms/platform/pojo/CommunityConfig.java
index e01b2d4..159a074 100644
--- a/platform-dal/src/main/java/com/lyms/platform/pojo/CommunityConfig.java
+++ b/platform-dal/src/main/java/com/lyms/platform/pojo/CommunityConfig.java
@@ -17,6 +17,7 @@ public class CommunityConfig {
     private Integer yn;
     private String gxxq;    //管辖小区
     private List<String> areas;
+    private List<BasicConfig> areasObj;
     private String areaNames;
 
     private String publishName;
@@ -24,6 +25,14 @@ public class CommunityConfig {
     private Long createDate;
     private Long modifiedDate;
 
+    public List<BasicConfig> getAreasObj() {
+        return areasObj;
+    }
+
+    public void setAreasObj(List<BasicConfig> areasObj) {
+        this.areasObj = areasObj;
+    }
+
     public String getPublishName() {
         return publishName;
     }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CommunityConfigController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CommunityConfigController.java
index 1231bb3..eaa3f86 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CommunityConfigController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CommunityConfigController.java
@@ -108,11 +108,15 @@ public class CommunityConfigController  extends BaseController {
             communityQuery.setId(null);
         }
         List<CommunityConfig> communityConfigList = communityConfigService.queryCommunity(communityQuery);
+        List<BasicConfig> basicConfigs = null;
+
         if(null != communityConfigList) {
             for(CommunityConfig communityConfig : communityConfigList) {
                 String areaNames = "";
+                basicConfigs =  new ArrayList<>();
                 for(String s : communityConfig.getAreas()) {
                     config = basicConfigService.getOneBasicConfigById(s);
+                    basicConfigs.add(config);
                     if(null != config) {
                         areaNames += config.getName() + ", ";
                     }
@@ -120,6 +124,7 @@ public class CommunityConfigController  extends BaseController {
                 if(2 < areaNames.length()) {
                     communityConfig.setAreaNames(areaNames.substring(0, areaNames.length()-2));
                 }
+                communityConfig.setAreasObj(basicConfigs);
             }
 
             return FrontEndResult.ini().setData(communityConfigList).setPageInfo(communityQuery.getPageInfo()).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("查询成功");
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java
index dfe8f71..6307b21 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java
@@ -256,6 +256,35 @@ public class OrganizationController extends BaseController {
         List<Object> data = new ArrayList<>();
         boolean falg  =StringUtils.isNotEmpty(f);
         for(Organization organization : organizations) {
+            if(null == organization.getAddress()) {
+                organization.setAddress("");
+            } else {
+                organization.setAddress(", " + organization.getAddress());
+            }
+            if(null != organization.getStreetId()) {
+                BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(organization.getStreetId());
+                if(null != basicConfig) {
+                    organization.setAddress(basicConfig.getName() + organization.getAddress());
+                }
+            }
+            if(null != organization.getAreaId()) {
+                BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(organization.getAreaId());
+                if(null != basicConfig) {
+                    organization.setAddress(basicConfig.getName() + organization.getAddress());
+                }
+            }
+            if(null != organization.getCityId()) {
+                BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(organization.getCityId());
+                if(null != basicConfig) {
+                    organization.setAddress(basicConfig.getName() + organization.getAddress());
+                }
+            }
+            if(null != organization.getProvinceId()) {
+                BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(organization.getProvinceId());
+                if(null != basicConfig) {
+                    organization.setAddress(basicConfig.getName() + organization.getAddress());
+                }
+            }
             organization.setTypeObj(OrganizationLevelEnum.getById(organization.getLevel()));
             organization.setLevelObj(OrganizationTypeEnum.getById(organization.getType()));
                 if(null != organization.getProvinceId()) {
-- 
1.8.3.1