From 089194133f26f57a999d8676f706bd727e160d71 Mon Sep 17 00:00:00 2001 From: "rui.zhang" Date: Sat, 7 May 2016 17:26:09 +0800 Subject: [PATCH] =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20bug=20fix=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=E6=9C=BA=E6=9E=84=E5=88=86=E9=A1=B5?= =?UTF-8?q?=20=E7=A9=BA=E6=8C=87=E9=92=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/OrganizationController.java | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) 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(); -- 1.8.3.1