From e5e57973c9bf3be694865bde7bbb833fe0836f67 Mon Sep 17 00:00:00 2001
From: chenwenjian <chenwenjian@axzo.cn>
Date: Sat, 8 Feb 2025 14:08:00 +0800
Subject: [PATCH] =?UTF-8?q?feat(REQ-3300):=20=E5=8F=91=E8=B5=B7=E4=BA=BA?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=9E=84=E5=BB=BA=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../server/service/impl/ChangeRecordServiceImpl.java   | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java
index 64c5d3d6..b9b63c7b 100644
--- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java
+++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java
@@ -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())