diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/listener/MyGlobalEventListener.java b/laws-modules/src/main/java/com/jero/modules/activiti/listener/MyGlobalEventListener.java index f621a1a4..b52985bb 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/listener/MyGlobalEventListener.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/listener/MyGlobalEventListener.java @@ -28,6 +28,7 @@ import org.activiti.engine.impl.persistence.entity.TaskEntity; import org.springframework.stereotype.Component; import java.util.Date; +import java.util.List; import java.util.Map; /** @@ -247,6 +248,17 @@ public class MyGlobalEventListener implements ActivitiEventListener { ProcessAll process = processAllService.getOne(new LambdaQueryWrapper() .eq(ProcessAll::getProcessInstanceId, processInstanceId)); ProcessNodeService processNodeService = SpringContextUtil.getBean(ProcessNodeService.class); + // 企标复审流程前两个节点都要视为第一个节点 + if (process.getPrcType().equals(ProcessTypeEnum.ES_RECHECK.getValue())) { + List nodeList = processNodeService.list(new LambdaQueryWrapper() + .eq(ProcessNode::getProcessDefinitionId, process.getProcessDefinitionId()) + .eq(ProcessNode::getSort, 2)); + for (ProcessNode node : nodeList) { + if (record.getNodeId().equals(node.getXmlNodeId()) && record.getTaskName().equals(node.getNodeName())) { + return true; + } + } + } ProcessNode node = processNodeService.getOne(new LambdaQueryWrapper() .eq(ProcessNode::getProcessDefinitionId, process.getProcessDefinitionId()) .eq(ProcessNode::getSort, 1));