From 133f87811f5bfac3a77f05bd0ac44ea058412703 Mon Sep 17 00:00:00 2001
From: "rui.zhang" <zhangrui@lymsh.com>
Date: Wed, 27 Apr 2016 16:04:48 +0800
Subject: [PATCH] platform permission        add return pageinfo

---
 .../web/controller/OrganizationController.java     | 23 ++++++++++++++++++++++
 1 file changed, 23 insertions(+)

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 c2a8e05..93a5364 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
@@ -10,6 +10,7 @@ import com.lyms.platform.common.utils.ResultUtils;
 import com.lyms.platform.operate.web.result.FrontEndResult;
 import com.lyms.platform.permission.model.Organization;
 import com.lyms.platform.permission.model.OrganizationQuery;
+import com.lyms.platform.permission.model.Regions;
 import com.lyms.platform.permission.model.Users;
 import com.lyms.platform.permission.service.*;
 import org.apache.commons.lang.StringUtils;
@@ -33,6 +34,8 @@ public class OrganizationController extends BaseController {
     private TokenService tokenService;
     @Autowired
     private OrganizationService organizationService;
+    @Autowired
+    private RegionsService regionsService;
 
 
     /**
@@ -188,6 +191,11 @@ public class OrganizationController extends BaseController {
         limit = limit == null ? 10 : limit;
         page = page == null ? 1 : page;
 
+        Regions regions = null;
+        if(null != areaId) {
+            regions = regionsService.getRegions(areaId);
+        }
+
 
         OrganizationQuery organizationQuery = new OrganizationQuery();
         organizationQuery.setId(id);
@@ -195,10 +203,25 @@ public class OrganizationController extends BaseController {
         organizationQuery.setSort("id desc");
         organizationQuery.setYn(YnEnums.YES.getId());
         organizationQuery.setPage(page);
+        organizationQuery.setProvinceId(areaId);
         organizationQuery.setLimit(limit);
         organizationQuery.setKeyword(keyword);
+
+        if(regions.getLevel().equals(1)) {
+            organizationQuery.setProvinceId(areaId);
+        }
+        if(regions.getLevel().equals(2)) {
+            organizationQuery.setCityId(areaId);
+        }
+        if(regions.getLevel().equals(3)) {
+            organizationQuery.setAreaId(areaId);
+        }
+
         List<Organization> organizations = organizationService.queryOrganization(organizationQuery);
 
+
+
+
         FrontEndResult frontEndResult = new FrontEndResult();
         frontEndResult.setData(organizations);
         frontEndResult.setPageInfo(organizationQuery.getPageInfo());
-- 
1.8.3.1