From fc8b1f33588f592b977e6b2535c2bb939debbc1a Mon Sep 17 00:00:00 2001 From: wangli <274027703@qq.com> Date: Wed, 19 Feb 2025 20:06:03 +0800 Subject: [PATCH] =?UTF-8?q?feat(REQ-3340)=20-=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E6=89=93=E5=8D=B0=E5=8F=98=E9=87=8F=E6=9F=A5=E8=AF=A2=E7=9A=84?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/controller/web/manage/PrintAdminController.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/manage/PrintAdminController.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/manage/PrintAdminController.java index 9b80a94a9..144de2002 100644 --- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/manage/PrintAdminController.java +++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/manage/PrintAdminController.java @@ -256,8 +256,8 @@ public class PrintAdminController implements PrintAdminApi { .forEach(taskLog -> { Map taskLogMap = new HashMap<>(); taskLogMap.put(PRINT_VAR_PROCESS_LOG_ACTIVITY_NAME, taskLog.getName()); - taskLogMap.put(PRINT_VAR_PROCESS_LOG_APPROVER_NAME, taskLog.getAssigneeSnapshot().getAssignerName()); Optional user = getUserInfo(taskLog.getAssigneeSnapshot()); + taskLogMap.put(PRINT_VAR_PROCESS_LOG_APPROVER_NAME, user.isPresent() ? user.get().getRealName() : ""); taskLogMap.put(PRINT_VAR_PROCESS_LOG_UNIT, user.isPresent() ? user.get().getOrganizationalUnitName() : ""); taskLogMap.put(PRINT_VAR_PROCESS_LOG_POSITION, user.isPresent() && Objects.nonNull(user.get().getJob()) ? user.get().getJob().getName() : ""); taskLogMap.put(PRINT_VAR_PROCESS_LOG_ADVICE, taskLog.getAdvice()); @@ -270,6 +270,9 @@ public class PrintAdminController implements PrintAdminApi { } private Optional getUserInfo(BpmnTaskDelegateAssigner assigner) { + if (Objects.isNull(assigner)) { + return Optional.empty(); + } OrgNodeUserBriefInfoListReq req = new OrgNodeUserBriefInfoListReq(); if (StringUtils.hasText(assigner.getTenantId())) { req.setWorkspaceId(Long.valueOf(assigner.getTenantId()));