diff --git a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/request/bpmn/process/BpmnProcessInstanceLogQueryDTO.java b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/request/bpmn/process/BpmnProcessInstanceLogQueryDTO.java index e0a4841d7..53a1ab6ee 100644 --- a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/request/bpmn/process/BpmnProcessInstanceLogQueryDTO.java +++ b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/request/bpmn/process/BpmnProcessInstanceLogQueryDTO.java @@ -47,6 +47,13 @@ public class BpmnProcessInstanceLogQueryDTO { @Builder.Default private Boolean hasButton = false; + /** + * 是否包含未来的节点,默认包含 + */ + @ApiModelProperty(value = "是否包含未来的节点,默认包含") + @Builder.Default + private Boolean includeFutureTasks = true; + /** * 是否需要加密(同一个实例的日志,在不同端[cms/oms]下,审批人的信息需要按一定规则进行隐藏控制) */ 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 4b42ba366..351f950ba 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 @@ -1245,7 +1245,7 @@ public class BpmnProcessInstanceServiceImpl implements BpmnProcessInstanceServic List forecasting = new ArrayList<>(); // 只有还在运行中的实例才需要推测后续节点 - if (Objects.equals(historicProcessInstance.getBusinessStatus(), PROCESSING.getStatus())) { + if (Objects.equals(historicProcessInstance.getBusinessStatus(), PROCESSING.getStatus()) && Objects.equals(Boolean.TRUE, dto.getIncludeFutureTasks())) { ProcessInstance instance = runtimeService.createProcessInstanceQuery() .processInstanceId(dto.getProcessInstanceId()) .includeProcessVariables()