From 7a1eb44657591b61b054ebd5a380a317b01af801 Mon Sep 17 00:00:00 2001
From: PoffyZhang <99775271@qq.com>
Date: Fri, 31 Mar 2023 11:18:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java
index 47f3772..7236ab0 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java
@@ -540,9 +540,10 @@ public class TodoCenterManage {
         }
         //进入上一个节点的标识
         Boolean enterBefore = Boolean.FALSE;
+        String thisAndOrNodeId = curr.getNodeId();
         for(int i = progressNodes.size() - 2;i >= 0;i--){
             //说明有会签 或签
-            if(progressNodes.get(i).getNodeId().equals(curr.getNodeId())){
+            if(progressNodes.get(i).getNodeId().equals(thisAndOrNodeId)){
                 //还在当前节点
                 if(!enterBefore){
                     if(thisAndOr.isEmpty()){
@@ -558,6 +559,7 @@ public class TodoCenterManage {
                     beforeAndOr.add(progressNodes.get(i));
                 }
             }else{
+                thisAndOrNodeId = progressNodes.get(i).getNodeId();
                 if(!enterBefore){
                     beforeNode = progressNodes.get(i);
                     enterBefore = Boolean.TRUE;