From 543e0ecf974fc0c474f0b15a9b61ca966c5c9dda Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 18 Oct 2022 14:49:56 +0800 Subject: [PATCH] =?UTF-8?q?/third/dataSync/page-user=E8=BF=94=E5=9B=9Ecust?= =?UTF-8?q?omerId,/gov/org/staff/editstaffinit=E5=85=BC=E5=AE=B9=E8=BF=90?= =?UTF-8?q?=E8=90=A5=E7=AB=AF=E8=B0=83=E7=94=A8=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/result/yantai/YtUserPageResDTO.java | 2 ++ .../main/resources/mapper/yantai/DataSyncUserDataDao.xml | 3 ++- .../main/java/com/epmet/service/impl/StaffServiceImpl.java | 7 +++++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/yantai/YtUserPageResDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/yantai/YtUserPageResDTO.java index 1600fa6052..38da48f7a9 100644 --- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/yantai/YtUserPageResDTO.java +++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/yantai/YtUserPageResDTO.java @@ -50,5 +50,7 @@ public class YtUserPageResDTO { * 备注；目前为空 */ private String remark; + + private String customerId; } diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/yantai/DataSyncUserDataDao.xml b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/yantai/DataSyncUserDataDao.xml index dbb8b3c455..fdcedc74d9 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/yantai/DataSyncUserDataDao.xml +++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/yantai/DataSyncUserDataDao.xml @@ -41,7 +41,8 @@ u.GENDER AS gender, u.`STATUS` AS status, IFNULL(u.STAFF_ID,'') AS staffId, - IFNULL(u.REMARK, '' ) AS remark + IFNULL(u.REMARK, '' ) AS remark, + u.CUSTOMER_ID as customerId FROM data_sync_user_data u LEFT JOIN data_sync_org_data o ON ( u.ORGANIZATION_ID = o.ORGANIZATION_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 9269f249ad..417cce8a29 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 @@ -135,8 +135,11 @@ public class StaffServiceImpl implements StaffService { @Override public Result editStaffInit(StaffInfoFromDTO fromDTO) { - CustomerAgencyEntity customerAgencyEntity = customerAgencyService.selectById(fromDTO.getAgencyId()); - fromDTO.setCustomerId(customerAgencyEntity.getCustomerId()); + //运营端-统一认证调用此接口时，客户id传值了。 + if(StringUtils.isBlank(fromDTO.getCustomerId())){ + CustomerAgencyEntity customerAgencyEntity = customerAgencyService.selectById(fromDTO.getAgencyId()); + fromDTO.setCustomerId(customerAgencyEntity.getCustomerId()); + } return epmetUserFeignClient.editStaffInit(fromDTO); }