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 provinceIds; private List typeList; private List idList; + public List getProvinceIds() { + return provinceIds; + } + + public void setProvinceIds(List provinceIds) { + this.provinceIds = provinceIds; + } + public List 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} + + and province_id in + + #{item} + + 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 list = autoMatchFacade.matchOrgId(loginState.getId()); + List a = new ArrayList<>(); + for (Integer integer : list) { + Organization organization = organizationService.getOrganization(integer); + if (null != organization) { + a.add(organization.getProvinceId()); + } + } + organizationQuery.setProvinceIds(a); } List organizations = organizationService.queryOrganization(organizationQuery);