Commit ca74f1465b92f2e2b7cc7d6b6c5715e09485d778
1 parent
cb4d5e360c
Exists in
master
and in
6 other branches
a
Showing 1 changed file with 6 additions and 7 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RegionController.java
View file @
ca74f14
| ... | ... | @@ -69,16 +69,15 @@ |
| 69 | 69 | query.setTypeId("b7ea005c-dfac-4c2a-bdae-25239b3f44fd"); |
| 70 | 70 | |
| 71 | 71 | if(UserTypeEnum.NORMAL_USER.getId().equals(user.getType())) { |
| 72 | - if("0".equals(parentId)){ | |
| 73 | - parentId=null; | |
| 74 | - } | |
| 75 | - /* if(null == user.getOrgId()) { | |
| 72 | + if(null == user.getOrgId()) { | |
| 76 | 73 | ResultUtils.buildResultAndWrite(httpServletResponse, ErrorCodeConstants.SYSTEM_ERROR, "user not defined orgId error!"); |
| 77 | 74 | return; |
| 78 | 75 | } |
| 79 | 76 | Organization organization = organizationService.getOrganization(user.getOrgId()); |
| 80 | - | |
| 81 | - if (null != organization.getProvinceId() && null==parentId) { | |
| 77 | + if("0".equals(parentId)){ | |
| 78 | + parentId = SystemConfig.CHINA_BASIC_ID;; | |
| 79 | + } | |
| 80 | + /* if (null != organization.getProvinceId() && null==parentId) { | |
| 82 | 81 | parentId = organization.getProvinceId(); |
| 83 | 82 | query.setId(parentId); |
| 84 | 83 | }else if(StringUtils.isNotEmpty(organization.getCityId())&&null!=parentId &&parentId.equals(organization.getProvinceId())) { |
| ... | ... | @@ -93,7 +92,7 @@ |
| 93 | 92 | query.setId(parentId); |
| 94 | 93 | }else {*/ |
| 95 | 94 | query.setParentId(parentId); |
| 96 | - //} | |
| 95 | +// } | |
| 97 | 96 | }else{ |
| 98 | 97 | query.setParentId(parentId); |
| 99 | 98 | } |