Browse Source

Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev

dev_shibei_match
jianjun 4 years ago
parent
commit
0e58294aae
  1. 8
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java

8
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java

@ -558,10 +558,10 @@ public class AgencyServiceImpl implements AgencyService {
result.setLevel(formDTO.getLevel()); result.setLevel(formDTO.getLevel());
result.setAgencyLevel(entity.getLevel()); result.setAgencyLevel(entity.getLevel());
//经纬度 如果本级没有则取根级组织的 根级没有就空着 //经纬度 如果本级没有则取根级组织的 根级没有就空着
if (StringUtils.isNotBlank(entity.getLatitude()){ if (StringUtils.isNotBlank(entity.getLatitude())){
result.setLatitude(new BigDecimal(entity.getLatitude())); result.setLatitude(new BigDecimal(entity.getLatitude()));
} }
if (StringUtils.isNotBlank(entity.getLongitude()){ if (StringUtils.isNotBlank(entity.getLongitude())){
result.setLongitude(new BigDecimal(entity.getLongitude())); result.setLongitude(new BigDecimal(entity.getLongitude()));
} }
if (entity.getLevel().equals(OrgInfoConstant.COMMUNITY)){ if (entity.getLevel().equals(OrgInfoConstant.COMMUNITY)){
@ -598,10 +598,10 @@ public class AgencyServiceImpl implements AgencyService {
result.setLevel(formDTO.getLevel()); result.setLevel(formDTO.getLevel());
result.setAgencyLevel(OrgInfoConstant.GRID); result.setAgencyLevel(OrgInfoConstant.GRID);
//经纬度 如果本级没有则取根级组织的 根级没有就空着 //经纬度 如果本级没有则取根级组织的 根级没有就空着
if (StringUtils.isNotBlank(entity.getLatitude()){ if (StringUtils.isNotBlank(entity.getLatitude())){
result.setLatitude(new BigDecimal(entity.getLatitude())); result.setLatitude(new BigDecimal(entity.getLatitude()));
} }
if (StringUtils.isNotBlank(entity.getLongitude()){ if (StringUtils.isNotBlank(entity.getLongitude())){
result.setLongitude(new BigDecimal(entity.getLongitude())); result.setLongitude(new BigDecimal(entity.getLongitude()));
} }
List<MapSonOrgResultDTO> son = customerAgencyDao.selectSonOrg(formDTO.getOrgId(), OrgInfoConstant.NEIGHBOR_HOOD); List<MapSonOrgResultDTO> son = customerAgencyDao.selectSonOrg(formDTO.getOrgId(), OrgInfoConstant.NEIGHBOR_HOOD);

Loading…
Cancel
Save