From 5499bfe724c35a29101d6e20fcd4def9c6fd251e Mon Sep 17 00:00:00 2001
From: CD <1103614279@qq.com>
Date: Thu, 1 Dec 2022 15:40:37 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=91=E6=8E=A7=E6=B5=81=E7=A8=8B=E6=9C=AA?=
 =?UTF-8?q?=E6=89=A7=E8=A1=8C=E7=9A=84=E8=8A=82=E7=82=B9=E4=B8=BA=E9=BB=91?=
 =?UTF-8?q?=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../instance/service/InstanceService.java                 | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/ydw/bat/wkflow/business_activiti/instance/service/InstanceService.java b/src/main/java/com/ydw/bat/wkflow/business_activiti/instance/service/InstanceService.java
index ddc2896d..8f9c4488 100644
--- a/src/main/java/com/ydw/bat/wkflow/business_activiti/instance/service/InstanceService.java
+++ b/src/main/java/com/ydw/bat/wkflow/business_activiti/instance/service/InstanceService.java
@@ -4,6 +4,7 @@ import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import org.activiti.bpmn.model.BpmnModel;
 import org.activiti.engine.HistoryService;
 import org.activiti.engine.RepositoryService;
@@ -11,6 +12,7 @@ import org.activiti.engine.history.HistoricActivityInstance;
 import org.activiti.engine.history.HistoricProcessInstance;
 import org.activiti.engine.impl.persistence.entity.ProcessDefinitionEntity;
 import org.activiti.image.impl.DefaultProcessDiagramGenerator;
+import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,7 +22,7 @@ import org.springframework.stereotype.Service;
 public class InstanceService {
 
 	protected Logger logger = LoggerFactory.getLogger(this.getClass());
-	
+
 	@Autowired
 	private RepositoryService repositoryService;
 
@@ -48,7 +50,9 @@ public class InstanceService {
 			int index = 1;
 			logger.info("获取已经执行的节点ID");
 			for (HistoricActivityInstance activityInstance : historicActivityInstanceList) {
-				executedActivityIdList.add(activityInstance.getActivityId());
+				if (ObjectUtils.isNotEmpty(activityInstance.getEndTime())) {
+					executedActivityIdList.add(activityInstance.getActivityId());
+				}
 				logger.info("第[" + index + "]个已执行节点=" + activityInstance.getActivityId() + " : "
 						+ activityInstance.getActivityName());
 				index++;