数据权限

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;