Skip to content

Commit

Permalink
Merge pull request #6 from axonivy-market/TE-585-restructure-for-sub-…
Browse files Browse the repository at this point in the history
…process

TE-585: Get sequence id with more field
  • Loading branch information
trungmaihova authored May 23, 2024
2 parents e660f3f + db5b4ac commit 650d008
Showing 1 changed file with 3 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -564,7 +564,8 @@ private Optional<SequenceFlow> getSequenceFlow(NodeElement nodeElement, String f
return flow;
}
}


//Sequence flow after Task
Optional<SequenceFlow> flow = outs.stream().filter(out -> hasFlowNameOrEmpty(out, flowName)).findFirst();

return flow;
Expand Down Expand Up @@ -624,7 +625,7 @@ private boolean isDefaultPath(SequenceFlow flow) {
}

private boolean isDefaultPath(Alternative alternative, SequenceFlow sequenceFlow) {
String currentElementId = sequenceFlow.getPid().getFieldId();
String currentElementId = sequenceFlow.getPid().getFieldIds();
List<String> nextTargetIds = processGraph.getNextTargetIdsByCondition(alternative, EMPTY);
return nextTargetIds.contains(currentElementId);
}
Expand Down

0 comments on commit 650d008

Please sign in to comment.