From 698fd40f136db87e7c1c0c51a1dafddbcefddd03 Mon Sep 17 00:00:00 2001
From: "1437892690@qq.com" <1437892690@qq.com>
Date: Mon, 12 Aug 2024 20:08:10 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20IT=E6=9C=8D=E5=8A=A1-?=
 =?UTF-8?q?=E6=97=B6=E6=95=88=E5=8F=AA=E5=85=B3=E8=81=94=E5=BC=80=E5=A7=8B?=
 =?UTF-8?q?=E6=AD=A5=E9=AA=A4=E6=97=B6=EF=BC=8C=E6=B2=A1=E6=9C=89=E8=A2=AB?=
 =?UTF-8?q?=E6=BF=80=E6=B4=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1221854017060865]IT服务-时效只关联开始步骤时，没有被激活 http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1221854017060865
---
 .../process/thread/ProcessTaskSlaThread.java  | 26 ++++++++++++-------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/main/java/neatlogic/module/process/thread/ProcessTaskSlaThread.java b/src/main/java/neatlogic/module/process/thread/ProcessTaskSlaThread.java
index e45bed955..73131d180 100644
--- a/src/main/java/neatlogic/module/process/thread/ProcessTaskSlaThread.java
+++ b/src/main/java/neatlogic/module/process/thread/ProcessTaskSlaThread.java
@@ -434,23 +434,29 @@ public class ProcessTaskSlaThread extends NeatLogicThread {
     private List<Long> slaIsInvalid(Long processTaskId) {
         List<Long> resultList = new ArrayList<>();
         ProcessTaskSlaVo processTaskSlaVo = new ProcessTaskSlaVo();
+        ProcessTaskStepVo startProcessTaskStep = processTaskMapper.getStartProcessTaskStepByProcessTaskId(processTaskId);
         List<Long> allSlaIdList = processTaskSlaMapper.getSlaIdListByProcessTaskId(processTaskId);
         for (Long slaId : allSlaIdList) {
             processTaskSlaVo.setId(slaId);
             boolean isActive = false;
             List<Long> processTaskStepIdList = processTaskSlaMapper.getProcessTaskStepIdListBySlaId(slaId);
-            for (Long processTaskStepId : processTaskStepIdList) {
-                List<ProcessTaskStepRelVo> processTaskStepRelList = processTaskMapper.getProcessTaskStepRelByToId(processTaskStepId);
-                for (ProcessTaskStepRelVo processTaskStepRelVo : processTaskStepRelList) {
-                    if (processTaskStepRelVo.getType().equals(ProcessFlowDirection.FORWARD.getValue())) {
-                        if (!Objects.equals(processTaskStepRelVo.getIsHit(), -1)) {
-                            isActive = true;
-                            break;
+            if (processTaskStepIdList.contains(startProcessTaskStep.getId())) {
+                // 时效关联开始步骤，则一定会被激活
+                isActive = true;
+            } else {
+                for (Long processTaskStepId : processTaskStepIdList) {
+                    List<ProcessTaskStepRelVo> processTaskStepRelList = processTaskMapper.getProcessTaskStepRelByToId(processTaskStepId);
+                    for (ProcessTaskStepRelVo processTaskStepRelVo : processTaskStepRelList) {
+                        if (processTaskStepRelVo.getType().equals(ProcessFlowDirection.FORWARD.getValue())) {
+                            if (!Objects.equals(processTaskStepRelVo.getIsHit(), -1)) {
+                                isActive = true;
+                                break;
+                            }
                         }
                     }
-                }
-                if (isActive) {
-                    break;
+                    if (isActive) {
+                        break;
+                    }
                 }
             }
             if (isActive) {
-- 
Gitee