From d3b5f86214108c1b83e2a92bb8a06380162bb6f1 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Fri, 6 May 2016 18:09:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/operate/web/controller/OrganizationController.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 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 d262a97..cb65ab7 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 @@ -5,6 +5,7 @@ import com.lyms.platform.biz.service.BasicConfigService; import com.lyms.platform.common.annotation.TokenRequired; import com.lyms.platform.common.base.BaseController; import com.lyms.platform.common.base.LoginContext; +import com.lyms.platform.common.base.PageInfo; import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.enums.OrganizationLevelEnum; import com.lyms.platform.common.enums.OrganizationTypeEnum; @@ -215,6 +216,7 @@ public class OrganizationController extends BaseController { List areaId = autoMatchFacade.matchOrgId(loginState.getId()); List data = new ArrayList<>(); List organizations; + PageInfo pageInfo =null; if (CollectionUtils.isNotEmpty(areaId)) { OrganizationQuery organizationQuery = new OrganizationQuery(); organizationQuery.setIdList(areaId); @@ -223,6 +225,7 @@ public class OrganizationController extends BaseController { list.add(4); organizationQuery.setYn(YnEnums.YES.getId()); // organizationQuery.setTypeList(list); + pageInfo=organizationQuery.getPageInfo(); organizations = organizationService.queryOrganization(organizationQuery); } else { @@ -230,7 +233,8 @@ public class OrganizationController extends BaseController { userOrganizationMapsQuery.setYn(YnEnums.YES.getId()); userOrganizationMapsQuery.setUserId(loginState.getId()); organizations = accessPermissionFacade.findAccessPerminssionByUserId(loginState.getId()); - + userOrganizationMapsQuery.mysqlBuild(organizations.size()); + pageInfo=userOrganizationMapsQuery.getPageInfo(); } if (CollectionUtils.isNotEmpty(organizations)) { for (Organization organization : organizations) { @@ -248,7 +252,7 @@ public class OrganizationController extends BaseController { data.add(map); } } - return new FrontEndResult().setData(data).setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS); + return new FrontEndResult().setData(data).setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS).setPageInfo(pageInfo); } -- 1.8.3.1