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++;