wangli/workflow-engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(REQ-3340) - 优化打印变量查询的逻辑

Browse Source
This commit is contained in:
wangli 2025-02-19 20:06:03 +08:00
parent e1c1ec215f
commit fc8b1f3358
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/manage/PrintAdminController.java
View File

@ -256,8 +256,8 @@ public class PrintAdminController implements PrintAdminApi {
.forEach(taskLog -> { .forEach(taskLog -> {
Map<String, Object> taskLogMap = new HashMap<>(); Map<String, Object> taskLogMap = new HashMap<>();
taskLogMap.put(PRINT_VAR_PROCESS_LOG_ACTIVITY_NAME, taskLog.getName()); taskLogMap.put(PRINT_VAR_PROCESS_LOG_ACTIVITY_NAME, taskLog.getName());
taskLogMap.put(PRINT_VAR_PROCESS_LOG_APPROVER_NAME, taskLog.getAssigneeSnapshot().getAssignerName());
Optional<OrgNodeUserBriefInfoResp> user = getUserInfo(taskLog.getAssigneeSnapshot()); Optional<OrgNodeUserBriefInfoResp> 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_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_POSITION, user.isPresent() && Objects.nonNull(user.get().getJob()) ? user.get().getJob().getName() : "");
taskLogMap.put(PRINT_VAR_PROCESS_LOG_ADVICE, taskLog.getAdvice()); taskLogMap.put(PRINT_VAR_PROCESS_LOG_ADVICE, taskLog.getAdvice());
@ -270,6 +270,9 @@ public class PrintAdminController implements PrintAdminApi {
} }
private Optional<OrgNodeUserBriefInfoResp> getUserInfo(BpmnTaskDelegateAssigner assigner) { private Optional<OrgNodeUserBriefInfoResp> getUserInfo(BpmnTaskDelegateAssigner assigner) {
if (Objects.isNull(assigner)) {
return Optional.empty();
}
OrgNodeUserBriefInfoListReq req = new OrgNodeUserBriefInfoListReq(); OrgNodeUserBriefInfoListReq req = new OrgNodeUserBriefInfoListReq();
if (StringUtils.hasText(assigner.getTenantId())) { if (StringUtils.hasText(assigner.getTenantId())) {
req.setWorkspaceId(Long.valueOf(assigner.getTenantId())); req.setWorkspaceId(Long.valueOf(assigner.getTenantId()));