diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmProcessInstanceServiceImpl.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmProcessInstanceServiceImpl.java index 1b9fdabeb..03c9856eb 100644 --- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmProcessInstanceServiceImpl.java +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmProcessInstanceServiceImpl.java @@ -74,7 +74,7 @@ public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService @Nullable Boolean hasVariable) { ProcessInstanceQuery instanceQuery = runtimeService.createProcessInstanceQuery().processInstanceBusinessKey(businessKey); - if (Boolean.TRUE.equals(hasVariable)) { + if (Objects.nonNull(hasVariable) && Boolean.TRUE.equals(hasVariable)) { instanceQuery.includeProcessVariables(); } if (StringUtils.isNotBlank(tenantId)) { @@ -103,7 +103,7 @@ public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService @Override public ProcessInstance getProcessInstance(String id, String tenantId, Boolean hasVariable) { ProcessInstanceQuery instanceQuery = runtimeService.createProcessInstanceQuery().processInstanceId(id); - if (Boolean.TRUE.equals(hasVariable)) { + if (Objects.nonNull(hasVariable) && Boolean.TRUE.equals(hasVariable)) { instanceQuery.includeProcessVariables(); } if (StringUtils.isNotBlank(tenantId)) {