|
@@ -443,6 +443,7 @@ public class FlowProcessServiceImpl implements FlowProcessService {
|
|
* 跳转到指定节点
|
|
* 跳转到指定节点
|
|
*/
|
|
*/
|
|
private FlowResult returnToNode(FlowJumpContext context, JumpDto dto) {
|
|
private FlowResult returnToNode(FlowJumpContext context, JumpDto dto) {
|
|
|
|
+ FlowDefinitionNode currentNode = context.getCurrentNode();
|
|
if (ObjectUtil.isEmpty(dto.getHandleNodeId())) {
|
|
if (ObjectUtil.isEmpty(dto.getHandleNodeId())) {
|
|
|
|
|
|
FlowExample flowExample = context.getFlowExample();
|
|
FlowExample flowExample = context.getFlowExample();
|
|
@@ -455,6 +456,7 @@ public class FlowProcessServiceImpl implements FlowProcessService {
|
|
List<FlowDefinitionNode> flowDefinitionNodeList = flowDefinitionNodeService.list(
|
|
List<FlowDefinitionNode> flowDefinitionNodeList = flowDefinitionNodeService.list(
|
|
q -> q.eq(FlowDefinitionNode::getFlowDefinitionId, flowExample.getDefinitionId())
|
|
q -> q.eq(FlowDefinitionNode::getFlowDefinitionId, flowExample.getDefinitionId())
|
|
.in(FlowDefinitionNode::getId, flowNodeIds)
|
|
.in(FlowDefinitionNode::getId, flowNodeIds)
|
|
|
|
+ .ne(FlowDefinitionNode::getId,currentNode.getId())
|
|
);
|
|
);
|
|
|
|
|
|
FlowResult flowResult = new FlowResult();
|
|
FlowResult flowResult = new FlowResult();
|