From cb4d5e360c575d5e3547b14e437d3435fcc9eee8 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Fri, 31 Mar 2017 13:17:18 +0800 Subject: [PATCH] a --- .../com/lyms/platform/operate/web/controller/RegionController.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RegionController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RegionController.java index 45db100..ed4606d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RegionController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RegionController.java @@ -69,14 +69,15 @@ public class RegionController extends BaseController{ query.setTypeId("b7ea005c-dfac-4c2a-bdae-25239b3f44fd"); if(UserTypeEnum.NORMAL_USER.getId().equals(user.getType())) { + if("0".equals(parentId)){ + parentId=null; + } /* if(null == user.getOrgId()) { ResultUtils.buildResultAndWrite(httpServletResponse, ErrorCodeConstants.SYSTEM_ERROR, "user not defined orgId error!"); return; } Organization organization = organizationService.getOrganization(user.getOrgId()); - if("0".equals(parentId)){ - parentId=null; - } + if (null != organization.getProvinceId() && null==parentId) { parentId = organization.getProvinceId(); query.setId(parentId); -- 1.8.3.1