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 3f1aaa2..d48032b 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 @@ -233,10 +233,13 @@ public class OrganizationController extends BaseController { PageInfo pageInfo =null; if (CollectionUtils.isNotEmpty(areaId)) { OrganizationQuery organizationQuery = new OrganizationQuery(); - organizationQuery.setNeed("true"); - organizationQuery.setSort("province_id desc,city_id desc,area_id desc"); - organizationQuery.setPage(page); - organizationQuery.setLimit(limit); + if(null != page && limit != page) { + organizationQuery.setNeed("true"); + organizationQuery.setPage(page); + organizationQuery.setLimit(limit); + organizationQuery.setSort("province_id desc,city_id desc,area_id desc"); + } + organizationQuery.setYn(YnEnums.YES.getId()); organizationQuery.setIdList(areaId); organizationQuery.setKeyword(keyword); @@ -257,11 +260,13 @@ public class OrganizationController extends BaseController { // pageInfo=userOrganizationMapsQuery.getPageInfo(); OrganizationQuery organizationQuery = new OrganizationQuery(); - organizationQuery.setNeed("tree"); - organizationQuery.setSort("province_id desc,city_id desc,area_id desc"); - organizationQuery.setLimit(limit); organizationQuery.setKeyword(keyword); - organizationQuery.setPage(page); + if(null != page && limit != page) { + organizationQuery.setNeed("true"); + organizationQuery.setPage(page); + organizationQuery.setLimit(limit); + organizationQuery.setSort("province_id desc,city_id desc,area_id desc"); + } organizationQuery.setYn(YnEnums.YES.getId()); organizations = organizationService.queryOrganization(organizationQuery); pageInfo = organizationQuery.getPageInfo();