feat(REQ-3300): 发起人信息构建调整

This commit is contained in:
chenwenjian 2025-02-08 10:54:23 +08:00
parent debd0b1805
commit be52bd2741

View File

@ -847,8 +847,7 @@ public class ChangeRecordServiceImpl extends ServiceImpl<ChangeRecordDao, Change
private static VisaChangeInitiatorResp buildInitiatorResp(Map<Long, OrgNodeUserBriefInfoResp> initiatorMap, ChangeRecordConfirm i) {
VisaChangeInitiatorResp.VisaChangeInitiatorRespBuilder initiatorBuilder = VisaChangeInitiatorResp.builder()
.personId(i.getPersonId())
.ouId(i.getOuId())
.nodeId(i.getNodeId());
.ouId(i.getOuId());
OrgNodeUserBriefInfoResp initiator = initiatorMap.get(i.getPersonId());
if (Objects.isNull(initiator)) {
log.error("获取发起人: {} 信息失败", i.getPersonId());
@ -860,6 +859,7 @@ public class ChangeRecordServiceImpl extends ServiceImpl<ChangeRecordDao, Change
.jobId(initiator.getOrganizationalJobId())
.jobName(initiator.getOrganizationalJobName())
.jobCode(initiator.getOrganizationalJobCode())
.nodeId(initiator.getOrganizationalNodeId())
.unitOrTeamName(OrganizationalNodeTypeEnum.PROJECT_TEAM.getValue().equals(initiator.getOrganizationalNodeType()) ? initiator.getOrganizationalNodeName() : initiator.getOrganizationalUnitName())
.build();
}
@ -882,7 +882,7 @@ public class ChangeRecordServiceImpl extends ServiceImpl<ChangeRecordDao, Change
AssertUtil.isTrue(CollUtil.isNotEmpty(visaIdInitiatorMap), "发起人信息获取失败");
/*获取发起人岗位*/
List<Long> initiatorPersonIdList = records.stream().map(ChangeRecord::getCreateBy).collect(Collectors.toList());
List<Long> initiatorPersonIdList = visaIdInitiatorMap.values().stream().map(ChangeRecordConfirm::getPersonId).distinct().collect(Collectors.toList());
// Map<id,OrgNodeUserBriefInfoResp>
Map<Long, OrgNodeUserBriefInfoResp> initiatorMap = getPersonBriefInfoMap(records.get(0).getRelationWorkspaceId(), initiatorPersonIdList);
AssertUtil.isTrue(CollUtil.isNotEmpty(initiatorMap), "发起人信息获取失败");