diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java index 155bad550c..2a5bcbb838 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java @@ -251,6 +251,28 @@ public class AgencyServiceImpl implements AgencyService { parentList = customerAgencyDao.selectPAgencyById(listStr); agencysResultDTO.setParentList(parentList); agencysResultDTO.setAreaCodeSwitch(customerOrgParameterService.getAreaCodeSwitch(entity.getCustomerId())); + //查询组织区划的名称 + if (null != entity && StringUtils.isNotBlank(entity.getAreaCode())) { + switch (entity.getLevel()) { + case CustomerAgencyConstant.PROVINCE_LEVEL: + agencysResultDTO.setAreaName(entity.getProvince()); + break; + case CustomerAgencyConstant.CITY_LEVEL: + agencysResultDTO.setAreaName(entity.getCity()); + break; + case CustomerAgencyConstant.DISTRICT: + agencysResultDTO.setAreaName(entity.getDistrict()); + break; + case CustomerAgencyConstant.STREET_LEVEL: + agencysResultDTO.setAreaName(entity.getStreet()); + break; + case CustomerAgencyConstant.COMMUNITY_LEVEL: + agencysResultDTO.setAreaName(entity.getCommunity()); + break; + default: + agencysResultDTO.setAreaName(StrConstant.EPMETY_STR); + } + } return new Result().ok(agencysResultDTO); }