Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditAgencyFormDTO.java

@@ -75,7 +75,7 @@ public class EditAgencyFormDTO implements Serializable {
     /**
      * open: 选择地区编码必填；closed:  无需选择地区编码;0409新增返参
      */
-    @NotBlank(message = "areaCodeSwitch不能为空", groups = AddUserInternalGroup.class)
+    // @NotBlank(message = "areaCodeSwitch不能为空", groups = AddUserInternalGroup.class)
     private String areaCodeSwitch;
 
     /**
@@ -108,4 +108,6 @@ public class EditAgencyFormDTO implements Serializable {
      * 中心点位位置
      */
     private String centerAddress;
+
+    private String customerId;
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java

@@ -172,6 +172,7 @@ public class AgencyController {
     @RequirePermission(requirePermission = RequirePermissionEnum.ORG_AGENCY_UPDATE)
     public Result editAgency(@LoginUser TokenDto tokenDTO, @RequestBody EditAgencyFormDTO formDTO) {
         formDTO.setUserId(tokenDTO.getUserId());
+        formDTO.setCustomerId(tokenDTO.getCustomerId());
         ValidatorUtils.validateEntity(formDTO, EditAgencyFormDTO.DefaultUserShowGroup.class, EditAgencyFormDTO.AddUserInternalGroup.class);
         Result result =  agencyService.editAgency(formDTO);
 

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

@@ -167,6 +167,8 @@ public class AgencyServiceImpl implements AgencyService {
             originalEntity.setLongitude(formDTO.getLongitude());
         }
         originalEntity.setCenterAddress(formDTO.getCenterAddress());
+        //平阴的工作端小程序与产品入参有差距，接口兼容，这个参数不让前端传了...
+        formDTO.setAreaCodeSwitch(customerOrgParameterService.getAreaCodeSwitch(formDTO.getCustomerId()));
         //当前客户开启了area_code_switch参数：open: 选择地区编码必填；closed:  无需选择地区编码
         if (CustomerAgencyConstant.AREA_CODE_SWITCH_OPEN.equals(formDTO.getAreaCodeSwitch())) {
             CustomerAgencyEntity parent = customerAgencyDao.selectById(originalEntity.getPid());