feat(REQ-3300): 发起人信息构建调整
This commit is contained in:
parent
be52bd2741
commit
e5e57973c9
@ -835,13 +835,16 @@ public class ChangeRecordServiceImpl extends ServiceImpl<ChangeRecordDao, Change
|
||||
.needJob(true)
|
||||
.needNode(true)
|
||||
.needUnit(true)
|
||||
.needProfile(true)
|
||||
// 考虑发起人离职、退场情况,故加上该参数
|
||||
.containsExited(true)
|
||||
.build();
|
||||
List<OrgNodeUserBriefInfoResp> nodeUserResp = nodeUserGateway.listOrgNodeUsers(nodeUserReq);
|
||||
if (CollectionUtils.isEmpty(nodeUserResp)) {
|
||||
return Collections.emptyMap();
|
||||
}
|
||||
// Map<personId,OrgNodeUserBriefInfoResp>
|
||||
return nodeUserResp.stream().collect(Collectors.toMap(OrgNodeUserBriefInfoResp::getPersonId, Function.identity()));
|
||||
return nodeUserResp.stream().collect(Collectors.toMap(OrgNodeUserBriefInfoResp::getPersonId, Function.identity(), (v1, v2) -> v1));
|
||||
}
|
||||
|
||||
private static VisaChangeInitiatorResp buildInitiatorResp(Map<Long, OrgNodeUserBriefInfoResp> initiatorMap, ChangeRecordConfirm i) {
|
||||
@ -850,12 +853,13 @@ public class ChangeRecordServiceImpl extends ServiceImpl<ChangeRecordDao, Change
|
||||
.ouId(i.getOuId());
|
||||
OrgNodeUserBriefInfoResp initiator = initiatorMap.get(i.getPersonId());
|
||||
if (Objects.isNull(initiator)) {
|
||||
log.error("获取发起人: {} 信息失败", i.getPersonId());
|
||||
// 发起人可能已退场
|
||||
log.warn("获取发起人: {} 信息失败", i.getPersonId());
|
||||
return initiatorBuilder.build();
|
||||
}
|
||||
return initiatorBuilder
|
||||
.name(initiator.getRealName())
|
||||
.avatar(initiator.getRealName())
|
||||
.avatar(initiator.getProfile().getAvatarUrl())
|
||||
.jobId(initiator.getOrganizationalJobId())
|
||||
.jobName(initiator.getOrganizationalJobName())
|
||||
.jobCode(initiator.getOrganizationalJobCode())
|
||||
|
||||
Loading…
Reference in New Issue
Block a user