From ca74f1465b92f2e2b7cc7d6b6c5715e09485d778 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Fri, 31 Mar 2017 13:29:25 +0800 Subject: [PATCH] a --- .../platform/operate/web/controller/RegionController.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 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 ed4606d..f8077e1 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,16 +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()) { + if(null == user.getOrgId()) { ResultUtils.buildResultAndWrite(httpServletResponse, ErrorCodeConstants.SYSTEM_ERROR, "user not defined orgId error!"); return; } Organization organization = organizationService.getOrganization(user.getOrgId()); - - if (null != organization.getProvinceId() && null==parentId) { + if("0".equals(parentId)){ + parentId = SystemConfig.CHINA_BASIC_ID;; + } + /* if (null != organization.getProvinceId() && null==parentId) { parentId = organization.getProvinceId(); query.setId(parentId); }else if(StringUtils.isNotEmpty(organization.getCityId())&&null!=parentId &&parentId.equals(organization.getProvinceId())) { @@ -93,7 +92,7 @@ public class RegionController extends BaseController{ query.setId(parentId); }else {*/ query.setParentId(parentId); - //} +// } }else{ query.setParentId(parentId); } -- 1.8.3.1