From 4dbf61c9189796ec46d39ac4b839cfc064e70411 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 12 八月 2021 16:11:16 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-common/src/main/java/com/java110/common/smo/impl/WorkflowInnerServiceSMOImpl.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/service-common/src/main/java/com/java110/common/smo/impl/WorkflowInnerServiceSMOImpl.java b/service-common/src/main/java/com/java110/common/smo/impl/WorkflowInnerServiceSMOImpl.java
old mode 100644
new mode 100755
index b874fd8..b261255
--- a/service-common/src/main/java/com/java110/common/smo/impl/WorkflowInnerServiceSMOImpl.java
+++ b/service-common/src/main/java/com/java110/common/smo/impl/WorkflowInnerServiceSMOImpl.java
@@ -524,9 +524,12 @@
HistoricProcessInstance hisProcessInstance = (HistoricProcessInstance) historyService
.createHistoricProcessInstanceQuery()
.processInstanceBusinessKey(workflowAuditInfoDto.getBusinessKey()).singleResult();
- // 璇ユ祦绋嬪疄渚嬬殑鎵�鏈夎妭鐐瑰鎵硅褰�
- List<HistoricActivityInstance> hisActInstList = getHisUserTaskActivityInstanceList(hisProcessInstance
- .getId());
+ List<HistoricActivityInstance> hisActInstList = new ArrayList<>();
+ if (hisProcessInstance != null) {
+ // 璇ユ祦绋嬪疄渚嬬殑鎵�鏈夎妭鐐瑰鎵硅褰�
+ hisActInstList = getHisUserTaskActivityInstanceList(hisProcessInstance
+ .getId());
+ }
List<WorkflowAuditInfoDto> workflowAuditInfoDtos = new ArrayList<>();
WorkflowAuditInfoDto tmpWorkflowAuditInfoDto = null;
for (Iterator iterator = hisActInstList.iterator(); iterator.hasNext(); ) {
--
Gitblit v1.8.0