From d12288a3c0f38e99f2c3e820d2a1a90c2aca88a8 Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Fri, 6 May 2016 17:18:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9C=BA=E6=9E=84=E6=8C=89?=
 =?UTF-8?q?=E7=85=A7=E6=9D=83=E9=99=90=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../permission/model/OrganizationQuery.java        | 10 +++++++-
 .../src/main/resources/mainOrm/Organization.xml    |  6 +++++
 .../web/controller/OrganizationController.java     | 27 +++++++++++++++-------
 3 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/OrganizationQuery.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/OrganizationQuery.java
index 79925a0..69275c0 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/OrganizationQuery.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/OrganizationQuery.java
@@ -27,10 +27,18 @@ public class OrganizationQuery extends BaseQuery {
     private String shortCode;
     private String keyword;
     private String foreignId;
-
+    private List<String> provinceIds;
     private List<Integer> typeList;
     private List<Integer> idList;
 
+    public List<String> getProvinceIds() {
+        return provinceIds;
+    }
+
+    public void setProvinceIds(List<String> provinceIds) {
+        this.provinceIds = provinceIds;
+    }
+
     public List<Integer> getIdList() {
         return idList;
     }
diff --git a/platform-biz-service/src/main/resources/mainOrm/Organization.xml b/platform-biz-service/src/main/resources/mainOrm/Organization.xml
index 8ad3b79..cc323b4 100644
--- a/platform-biz-service/src/main/resources/mainOrm/Organization.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/Organization.xml
@@ -183,6 +183,12 @@ select id,name,type,level,area_manage,province_id,city_id,area_id,address,descri
                     #{item}
                 </foreach>
             </if>
+            <if test="provinceIds != null and provinceIds.size() > 0">
+                and province_id in
+                <foreach collection="provinceIds" index="index" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
         </where>
     </sql>
 
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 3227b02..cc9f157 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
@@ -223,7 +223,7 @@ public class OrganizationController extends BaseController {
             list.add(4);
             organizationQuery.setYn(YnEnums.YES.getId());
 //            organizationQuery.setTypeList(list);
-            organizations  = organizationService.queryOrganization(organizationQuery);
+            organizations = organizationService.queryOrganization(organizationQuery);
 
         } else {
             UserOrganizationMapsQuery userOrganizationMapsQuery = new UserOrganizationMapsQuery();
@@ -250,13 +250,13 @@ public class OrganizationController extends BaseController {
     @RequestMapping(value = "/organization", method = RequestMethod.GET)
     @ResponseBody
     @TokenRequired
-    public FrontEndResult getOrganization(
-            @RequestParam(value = "id", required = false) Integer id,
-            @RequestParam(value = "keyword", required = false) String keyword,
-            @RequestParam(value = "page", required = false) Integer page,
-            @RequestParam(value = "limit", required = false) Integer limit,
-            @RequestParam(value = "areaId", required = false) String areaId,
-            @RequestParam(value = "lite", required = false) String f) {
+    public FrontEndResult getOrganization(HttpServletRequest request,
+                                          @RequestParam(value = "id", required = false) Integer id,
+                                          @RequestParam(value = "keyword", required = false) String keyword,
+                                          @RequestParam(value = "page", required = false) Integer page,
+                                          @RequestParam(value = "limit", required = false) Integer limit,
+                                          @RequestParam(value = "areaId", required = false) String areaId,
+                                          @RequestParam(value = "lite", required = false) String f) {
 
         limit = limit == null ? 10 : limit;
         page = page == null ? 1 : page;
@@ -293,6 +293,17 @@ public class OrganizationController extends BaseController {
                     }
                 }
             }
+        } else if ("0".equals(areaId)) {
+            LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
+            List<Integer> list = autoMatchFacade.matchOrgId(loginState.getId());
+            List<String> a =  new ArrayList<>();
+            for (Integer integer : list) {
+                Organization organization = organizationService.getOrganization(integer);
+                if (null != organization) {
+                 a.add(organization.getProvinceId());
+                }
+            }
+            organizationQuery.setProvinceIds(a);
         }
 
         List<Organization> organizations = organizationService.queryOrganization(organizationQuery);
-- 
1.8.3.1