Browse Source

/third/dataSync/page-user返回customerId,/gov/org/staff/editstaffinit兼容运营端调用。

dev
yinzuomei 3 years ago
parent
commit
543e0ecf97
  1. 2
      epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/yantai/YtUserPageResDTO.java
  2. 3
      epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/yantai/DataSyncUserDataDao.xml
  3. 3
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java

2
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;
}

3
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 )

3
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<StaffInitResultDTO> editStaffInit(StaffInfoFromDTO fromDTO) {
//运营端-统一认证调用此接口时,客户id传值了。
if(StringUtils.isBlank(fromDTO.getCustomerId())){
CustomerAgencyEntity customerAgencyEntity = customerAgencyService.selectById(fromDTO.getAgencyId());
fromDTO.setCustomerId(customerAgencyEntity.getCustomerId());
}
return epmetUserFeignClient.editStaffInit(fromDTO);
}

Loading…
Cancel
Save