Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions apps/application/flow/workflow_manage.py
Original file line number Diff line number Diff line change
Expand Up @@ -665,15 +665,16 @@ def get_next_node_list(self, current_node, current_node_result):
if next_node.properties.get('condition', "AND") == 'AND':
if self.dependent_node_been_executed(edge.targetNodeId):
up_nodes = self.flow.get_up_nodes(edge.targetNodeId)
up_node_id_list = current_node.up_node_id_list
up_node_id_list = [*current_node.up_node_id_list, current_node.node.id]
if up_nodes and len(up_nodes) > 1:
up_nodes.sort(key=lambda node: node.id)
first = up_nodes[0]
up_node_id_list = [n_c for n_c in self.node_context if n_c.node.id == first.id][
0].up_node_id_list
up_node_id_list = [*up_node_id_list, first.id]
node_list.append(
self.get_node_cls_by_id(edge.targetNodeId,
[*up_node_id_list, current_node.node.id]))
up_node_id_list))
else:
node_list.append(
self.get_node_cls_by_id(edge.targetNodeId,
Expand All @@ -686,15 +687,16 @@ def get_next_node_list(self, current_node, current_node_result):
if next_node.properties.get('condition', "AND") == 'AND':
if self.dependent_node_been_executed(edge.targetNodeId):
up_nodes = self.flow.get_up_nodes(edge.targetNodeId)
up_node_id_list = current_node.up_node_id_list
up_node_id_list = [*current_node.up_node_id_list, current_node.node.id]
if up_nodes and len(up_nodes) > 1:
up_nodes.sort(key=lambda node: node.id)
first = up_nodes[0]
up_node_id_list = [n_c for n_c in self.node_context if n_c.node.id == first.id][
0].up_node_id_list
up_node_id_list = [*up_node_id_list, first.id]
node_list.append(
self.get_node_cls_by_id(edge.targetNodeId,
[*up_node_id_list, current_node.node.id]))
up_node_id_list))
else:
node_list.append(
self.get_node_cls_by_id(edge.targetNodeId,
Expand Down