From a40dbdb170da2f39f8d02f4635cdf8dbe04e1c75 Mon Sep 17 00:00:00 2001 From: "rui.zhang" Date: Wed, 27 Apr 2016 16:17:33 +0800 Subject: [PATCH] platform permission add return pageinfo --- .../platform/operate/web/controller/OrganizationController.java | 6 +++--- 1 file changed, 3 insertions(+), 3 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 93a5364..af5cbec 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 @@ -207,13 +207,13 @@ public class OrganizationController extends BaseController { organizationQuery.setLimit(limit); organizationQuery.setKeyword(keyword); - if(regions.getLevel().equals(1)) { + if(null != regions && regions.getLevel().equals(1)) { organizationQuery.setProvinceId(areaId); } - if(regions.getLevel().equals(2)) { + if(null != regions && regions.getLevel().equals(2)) { organizationQuery.setCityId(areaId); } - if(regions.getLevel().equals(3)) { + if(null != regions && regions.getLevel().equals(3)) { organizationQuery.setAreaId(areaId); } -- 1.8.3.1