From 16cab43752365102085c822e816b71df1b9e2d08 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 23 Mar 2022 14:59:02 +0800
Subject: [PATCH] =?UTF-8?q?/gov/org/agency/editagency=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E7=BB=84=E7=BB=87=E4=BF=A1=E6=81=AFbugfix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dto/form/EditAgencyFormDTO.java   | 4 +++-
 .../src/main/java/com/epmet/controller/AgencyController.java  | 1 +
 .../main/java/com/epmet/service/impl/AgencyServiceImpl.java   | 2 ++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditAgencyFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditAgencyFormDTO.java
index 7473027fde..57e535ad25 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditAgencyFormDTO.java
+++ b/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;
 }
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java
index 363f7b7297..6ede7c8216 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java
@@ -150,6 +150,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);
 
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 c20fd83965..5ca472eff8 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
@@ -165,6 +165,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());