From 642de0e9490c68dd9befaa66b1e83c387c55add4 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Fri, 31 Mar 2017 13:04:21 +0800 Subject: [PATCH] a --- .../com/lyms/platform/operate/web/controller/RegionController.java | 6 +++--- 1 file changed, 3 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 cd1e8f6..45db100 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,7 +69,7 @@ public class RegionController extends BaseController{ query.setTypeId("b7ea005c-dfac-4c2a-bdae-25239b3f44fd"); if(UserTypeEnum.NORMAL_USER.getId().equals(user.getType())) { - if(null == user.getOrgId()) { + /* if(null == user.getOrgId()) { ResultUtils.buildResultAndWrite(httpServletResponse, ErrorCodeConstants.SYSTEM_ERROR, "user not defined orgId error!"); return; } @@ -90,9 +90,9 @@ public class RegionController extends BaseController{ else if(StringUtils.isNotEmpty(organization.getStreetId())&&null!=parentId &&parentId.equals(organization.getAreaId())) { parentId = organization.getStreetId(); query.setId(parentId); - }else { + }else {*/ query.setParentId(parentId); - } + //} }else{ query.setParentId(parentId); } -- 1.8.3.1