From c1fdaaf54b1c8a009cbb4d5d5d2d9c9353897864 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 19 Oct 2022 14:38:25 +0800 Subject: [PATCH] =?UTF-8?q?/gov/org/staff/editstaffinit=E5=85=BC=E5=AE=B9?= =?UTF-8?q?=E8=BF=90=E8=90=A5=E7=AB=AF=E5=8E=BB=E8=B0=83=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/form/StaffInfoFromDTO.java | 1 + .../main/java/com/epmet/service/impl/StaffServiceImpl.java | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/StaffInfoFromDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/StaffInfoFromDTO.java index 7c2a885f06..1592c4fea3 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/StaffInfoFromDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/StaffInfoFromDTO.java @@ -18,6 +18,7 @@ public class StaffInfoFromDTO implements Serializable { /** * 客户ID */ + @NotBlank(message = "customerId不能为空",groups = EditStaffInitGroup.class) private String customerId; /** * 机关ID diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java index c642caddd2..9f337196ca 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java @@ -154,6 +154,10 @@ public class StaffServiceImpl implements StaffService { if (null == customerStaffAgencyDTO) { throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "customer_staff_agency is null user_id :" + fromDTO.getStaffId(), "查询用户所属组织为空"); } + //运营端-统一认证那调用的时候， agencyId为空，这里重新赋值下 + if(StringUtils.isBlank(fromDTO.getAgencyId())){ + fromDTO.setAgencyId(customerStaffAgencyDTO.getAgencyId()); + } Result res=epmetUserFeignClient.editStaffInit(fromDTO); if (res.success() && null != res.getData()) { res.getData().setAgencyId(customerStaffAgencyDTO.getAgencyId());