"editagency"修改

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

@@ -165,17 +165,6 @@ public class AgencyServiceImpl implements AgencyService {
             CustomerAgencyEntity customerAgencyEntity = ConvertUtils.sourceToTarget(agency,CustomerAgencyEntity.class);
             customerAgencyEntity.setAllParentName(allParentName.toString());
             customerAgencyEntity.setUpdatedBy(formDTO.getUserId());
-            if (CustomerAgencyConstant.PROVINCE_LEVEL.equals(entity.getLevel())) {
-                customerAgencyEntity.setProvince(entity.getOrganizationName());
-            } else if (CustomerAgencyConstant.CITY_LEVEL.equals(entity.getLevel())) {
-                customerAgencyEntity.setCity(entity.getOrganizationName());
-            } else if (CustomerAgencyConstant.DISTRICT.equals(entity.getLevel())) {
-                customerAgencyEntity.setDistrict(entity.getOrganizationName());
-            } else if (CustomerAgencyConstant.STREET_LEVEL.equals(entity.getLevel())) {
-                customerAgencyEntity.setStreet(entity.getOrganizationName());
-            } else if (CustomerAgencyConstant.COMMUNITY_LEVEL.equals(entity.getLevel())) {
-                customerAgencyEntity.setCommunity(entity.getOrganizationName());
-            }
             editList.add(customerAgencyEntity);
         });
         //4:批量更新因一个组织名称变动而引起的其他组织字段值的变动
@@ -192,17 +181,6 @@ public class AgencyServiceImpl implements AgencyService {
     private CustomerAgencyEntity getUpdateEntity(EditAgencyFormDTO formDTO) {
         CustomerAgencyEntity entity = customerAgencyDao.selectById(formDTO.getAgencyId());
         entity.setOrganizationName(formDTO.getAgencyName());
-        if (CustomerAgencyConstant.PROVINCE_LEVEL.equals(entity.getLevel())) {
-            entity.setProvince(entity.getOrganizationName());
-        } else if (CustomerAgencyConstant.CITY_LEVEL.equals(entity.getLevel())) {
-            entity.setCity(entity.getOrganizationName());
-        } else if (CustomerAgencyConstant.DISTRICT.equals(entity.getLevel())) {
-            entity.setDistrict(entity.getOrganizationName());
-        } else if (CustomerAgencyConstant.STREET_LEVEL.equals(entity.getLevel())) {
-            entity.setStreet(entity.getOrganizationName());
-        } else if (CustomerAgencyConstant.COMMUNITY_LEVEL.equals(entity.getLevel())) {
-            entity.setCommunity(entity.getOrganizationName());
-        }
         return entity;
     }