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 795a048..ec753e7 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 @@ -54,6 +54,8 @@ public class RegionController extends BaseController{ ResultUtils.buildResultAndWrite(httpServletResponse, ErrorCodeConstants.SYSTEM_ERROR, "not find login user!"); return; } + BasicConfigQuery query = new BasicConfigQuery(); + query.setYn(YnEnums.YES.getId()); if(user.getType().equals(1)) { if(null == user.getOrgId()) { @@ -61,28 +63,34 @@ public class RegionController extends BaseController{ return; } Organization organization = organizationService.getOrganization(user.getOrgId()); - if(null != organization.getStreetId()) { - parentId = organization.getStreetId(); - } else if(null != organization.getAreaId()) { - parentId = organization.getAreaId(); - } else if(null != organization.getCityId()) { - parentId = organization.getCityId(); - } else if (null != organization.getProvinceId()) { + if (null != organization.getProvinceId() && null==parentId) { parentId = organization.getProvinceId(); + query.setId(parentId); + }else if(StringUtils.isNotEmpty(organization.getCityId())&&null!=parentId &&parentId.equals(organization.getProvinceId())) { + parentId = organization.getCityId(); + query.setId(parentId); + }else if(StringUtils.isNotEmpty(organization.getAreaId())&&null!=parentId &&parentId.equals(organization.getCityId())) { + parentId = organization.getAreaId(); + query.setId(parentId); + } + else if(StringUtils.isNotEmpty(organization.getStreetId())&&null!=parentId &&parentId.equals(organization.getAreaId())) { + parentId = organization.getStreetId(); + query.setId(parentId); + }else { + query.setParentId(parentId); } } if (user.getType().equals(0) && ("0".equals(parentId) || StringUtils.isBlank(parentId))) { parentId = SystemConfig.CHINA_BASIC_ID; + query.setParentId(parentId); } - BasicConfigQuery query = new BasicConfigQuery(); - query.setYn(YnEnums.YES.getId()); - query.setParentId(parentId); + List configList = basicConfigService.queryBasicConfig(query); List> list =new ArrayList>(); - if(CollectionUtils.isNotEmpty(configList)){ + if (CollectionUtils.isNotEmpty(configList)){ for (BasicConfig config :configList){ Map region=new HashMap(); region.put("id",config.getId());