From d934b032a82d582b0fe97f752a604ec809c363ee Mon Sep 17 00:00:00 2001
From: wangli <274027703@qq.com>
Date: Wed, 19 Jul 2023 17:03:14 +0800
Subject: [PATCH] =?UTF-8?q?update=20-=20=E5=A4=84=E7=90=86=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=B5=81=E7=A8=8B=E5=AE=9E=E4=BE=8B=E6=97=B6=E5=85=A5?=
 =?UTF-8?q?=E5=8F=82=E4=B8=AD=E7=9A=84=20hasVariable=20=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/service/impl/BpmProcessInstanceServiceImpl.java      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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)) {