bugfix

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

@@ -152,9 +152,9 @@ public class AgencyServiceImpl implements AgencyService {
         originalEntity.setCode(formDTO.getCode());
         originalEntity.setContacts(formDTO.getContacts());
         originalEntity.setMobile(formDTO.getMobile());
-        if(StringUtils.isNotBlank(formDTO.getAreaCode())&&formDTO.getAreaCode().equals(originalEntity.getAreaCode())){
+        if (StringUtils.isNotBlank(formDTO.getAreaCode()) && !formDTO.getAreaCode().equals(originalEntity.getAreaCode())) {
             //如果修改了areaCode。
-            customerAgencyDao.updateSubAgencyAreaCode(originalEntity.getCustomerId(),originalEntity.getAreaCode(),formDTO.getUserId());
+            customerAgencyDao.updateSubAgencyAreaCode(originalEntity.getCustomerId(), originalEntity.getAreaCode(), formDTO.getUserId());
         }
         //判断areaCodeSwitch：open: 选择地区编码必填；closed:  无需选择地区编码
         if (CustomerAgencyConstant.AREA_CODE_SWITCH_OPEN.equals(formDTO.getAreaCodeSwitch())) {

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml

@@ -725,7 +725,7 @@
         UPDATE customer_agency
         SET AREA_CODE = '',
         PARENT_AREA_CODE = '',
-        UPDATED_BY=#{operateUserId}
+        UPDATED_BY=#{operateUserId},
         UPDATED_TIME = NOW()
         WHERE
             DEL_FLAG = '0'