From f4f97fdbf367efa00df9d66149f119df57699016 Mon Sep 17 00:00:00 2001 From: wangli <274027703@qq.com> Date: Mon, 10 Nov 2025 16:46:16 +0800 Subject: [PATCH] =?UTF-8?q?feat(REQ-5965)=20-=20=E8=A7=A3=E5=86=B3?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=B5=81=E7=A8=8B=E6=96=87=E6=A1=A3=20api=20?= =?UTF-8?q?=E5=86=85=E9=83=A8=E8=BF=9B=E6=94=AF=E6=8C=81=E8=BF=90=E8=A1=8C?= =?UTF-8?q?=E6=97=B6=E7=9A=84=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/BpmnProcessInstanceServiceImpl.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmnProcessInstanceServiceImpl.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmnProcessInstanceServiceImpl.java index 62c62f7b9..456fdaba9 100644 --- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmnProcessInstanceServiceImpl.java +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmnProcessInstanceServiceImpl.java @@ -1922,8 +1922,9 @@ public class BpmnProcessInstanceServiceImpl implements BpmnProcessInstanceServic } else { tenantId = docs.get(0).getTenantId(); } - List bizCustomDocs = Optional.ofNullable( - runtimeService.getVariable(processInstanceId, SIGN_BIZ_CUSTOM_DOCS, List.class)) + HistoricVariableInstance historicVariableInstance = historyService.createHistoricVariableInstanceQuery().processInstanceId(processInstanceId) + .variableName(SIGN_BIZ_CUSTOM_DOCS).singleResult(); + List bizCustomDocs = Optional.ofNullable((List) historicVariableInstance.getValue()) .orElse(Collections.emptyList()); // 业务自定义文档 @@ -1936,7 +1937,8 @@ public class BpmnProcessInstanceServiceImpl implements BpmnProcessInstanceServic t.setFileRelationId(s.getFileKey()); }); - List basedFileTagOrder = runtimeService.getVariable(processInstanceId, SIGN_BIZ_BASED_FILE_TAG_ORDER, List.class); + HistoricVariableInstance signBizOrder = historyService.createHistoricVariableInstanceQuery().processInstanceId(processInstanceId).variableName(SIGN_BIZ_BASED_FILE_TAG_ORDER).singleResult(); + List basedFileTagOrder = Optional.ofNullable((List) signBizOrder.getValue()).orElse(Collections.emptyList()); if (!CollectionUtils.isEmpty(basedFileTagOrder)) { docs.addAll(customBizDocs); // 基于 fileTag 排序 @@ -1948,7 +1950,8 @@ public class BpmnProcessInstanceServiceImpl implements BpmnProcessInstanceServic docs = docs.stream().sorted(Comparator.comparingInt(d -> fileTagOrderMap.getOrDefault(d.getTag(), Integer.MAX_VALUE))) .collect(Collectors.toList()); } else { - String customAddType = runtimeService.getVariable(processInstanceId, SIGN_BIZ_CUSTOM_DOC_ADD_ORDER_TYPE, String.class); + HistoricVariableInstance bizDocOrderType = historyService.createHistoricVariableInstanceQuery().processInstanceId(processInstanceId).variableName(SIGN_BIZ_CUSTOM_DOC_ADD_ORDER_TYPE).singleResult(); + String customAddType = String.valueOf(bizDocOrderType.getValue()); if ("last".equals(customAddType)) { docs.addAll(customBizDocs); } else {