fix: bug#AI Commit#

Author: zqburde

dss-orchestrator/orchestrators/dss-workflow/dss-flow-execution-server/src/main/scala/com/webank/wedatasphere/dss/flow/execution/entrance/resolver/FlowDependencyResolverImpl.scala

@@ -64,8 +64,9 @@ class FlowDependencyResolverImpl extends FlowDependencyResolver with Logging {
         workflowNodesById.get(edge.getSource).exists { sourceNode =>
           BranchExpressionUtils.isBranchNode(sourceNode) &&
             flowContext.isNodeCompleted(sourceNode.getName) &&
-            flowJob.hasBranchSelection(sourceNode.getId) &&
-            !flowJob.isBranchTargetSelected(sourceNode.getId, node.getId)
+            (flowContext.isNodeSkipped(sourceNode.getName) ||
+              !flowJob.hasBranchSelection(sourceNode.getId) ||
+              !flowJob.isBranchTargetSelected(sourceNode.getId, node.getId))
         }
       }
     }
@@ -79,12 +80,15 @@ class FlowDependencyResolverImpl extends FlowDependencyResolver with Logging {
       incomingEdges(node).forall { edge =>
         workflowNodesById.get(edge.getSource) match {
           case Some(sourceNode) if BranchExpressionUtils.isBranchNode(sourceNode) =>
-            flowJob.hasBranchSelection(sourceNode.getId) && flowJob.isBranchTargetSelected(sourceNode.getId, node.getId)
+            flowContext.isNodeSucceed(sourceNode.getName) &&
+              flowJob.hasBranchSelection(sourceNode.getId) &&
+              flowJob.isBranchTargetSelected(sourceNode.getId, node.getId)
           case _ => true
         }
       }
     }
 
+
     nodes.foreach { node =>
       val nodeName = node.getName
       def isCanExecutable: Boolean = {