From 0bbe3ac971a3eaf0ba0cc542a4bbef86da7c9e13 Mon Sep 17 00:00:00 2001
From: lorne <1991wangliang@gmail.com>
Date: Mon, 16 Nov 2026 20:50:40 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E9=80=80=E5=9B=9E=E5=80=99=E9=80=89?=
=?UTF-8?q?=E8=8A=82=E7=82=B9=E6=94=B9=E4=B8=BA=E5=9F=BA=E4=BA=8E=E6=89=A7?=
=?UTF-8?q?=E8=A1=8C=E5=8E=86=E5=8F=B2=E5=B9=B6=E6=94=B6=E7=B4=A7=E9=80=80?=
=?UTF-8?q?=E5=9B=9E=E6=A0=A1=E9=AA=8C=20(framework)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- FlowContent 新增 backNodes:只包含当前记录真实执行过的历史节点,
倒序去重保证"最近经过的节点"优先(停留在 C 时为 B、A),
且没有候选时不向展示按钮集合下发 RETURN,修正开始节点
"退回按钮可点但提交必然失败"的错误交互(issue #270)
- BackNodeHelper 新增 historyBackNodes,按记录 id 正序倒序遍历历史记录,
同一节点多次执行只保留最近一次,未执行的分支节点天然被排除
- ActionManager 收紧 RETURN 校验:开始节点不支持退回;
退回目标必须存在于当前记录的历史执行链(并行/条件分支中
"结构上不是下游但从未执行"的节点同样被拒绝)
- FlowStateException 新增 nodeNotSupportReturn / backNodeNotInHistory
- BaseAction.show 兼容缺少 display 配置的旧流程数据,避免详情接口空指针
- 新增 FlowIssue270ReturnNodeControlTest(历史候选、最近优先、未执行分支拒绝、开始节点)
Closes #270
---
.../com/codingapi/flow/action/BaseAction.java | 4 +-
.../flow/exception/FlowStateException.java | 21 ++
.../codingapi/flow/manager/ActionManager.java | 34 ++
.../flow/node/helper/BackNodeHelper.java | 67 +++-
.../flow/pojo/response/FlowContent.java | 31 +-
.../flow/service/impl/FlowDetailService.java | 22 ++
.../FlowIssue270ReturnNodeControlTest.java | 343 ++++++++++++++++++
7 files changed, 513 insertions(+), 9 deletions(-)
create mode 100644 flow-engine-framework/src/test/java/com/codingapi/flow/service/FlowIssue270ReturnNodeControlTest.java
diff --git a/flow-engine-framework/src/main/java/com/codingapi/flow/action/BaseAction.java b/flow-engine-framework/src/main/java/com/codingapi/flow/action/BaseAction.java
index be57296d..60f77b1f 100644
--- a/flow-engine-framework/src/main/java/com/codingapi/flow/action/BaseAction.java
+++ b/flow-engine-framework/src/main/java/com/codingapi/flow/action/BaseAction.java
@@ -48,7 +48,9 @@ public ActionDisplay display() {
@Override
public boolean show(FlowSession flowSession) {
- return this.display.show(flowSession);
+ // 兼容早期设计/导入的流程数据:动作缺少 display 配置时按默认展示处理,
+ // 与 ActionDisplay 未配置展示脚本即展示的口径一致,避免详情接口空指针
+ return this.display == null || this.display.show(flowSession);
}
@Override
diff --git a/flow-engine-framework/src/main/java/com/codingapi/flow/exception/FlowStateException.java b/flow-engine-framework/src/main/java/com/codingapi/flow/exception/FlowStateException.java
index cbe2599c..aac905ea 100644
--- a/flow-engine-framework/src/main/java/com/codingapi/flow/exception/FlowStateException.java
+++ b/flow-engine-framework/src/main/java/com/codingapi/flow/exception/FlowStateException.java
@@ -109,6 +109,27 @@ public static FlowStateException nodeNotSupportRevoke() {
return new FlowStateException("node.notSupportRevoke", "Node not support revoke");
}
+
+ /**
+ * Node not support return (start node has no history node to return)
+ *
+ * @return exception
+ */
+ public static FlowStateException nodeNotSupportReturn() {
+ return new FlowStateException("node.notSupportReturn", "Node not support return");
+ }
+
+ /**
+ * Return target node is not executed in current process
+ *
+ * @param nodeId node id
+ * @return exception
+ */
+ public static FlowStateException backNodeNotInHistory(String nodeId) {
+ return new FlowStateException("node.backNode.notInHistory",
+ String.format("Return target node %s is not in the executed history", nodeId));
+ }
+
/**
* Record not support urge
*
diff --git a/flow-engine-framework/src/main/java/com/codingapi/flow/manager/ActionManager.java b/flow-engine-framework/src/main/java/com/codingapi/flow/manager/ActionManager.java
index e775e0bc..39d01fbf 100644
--- a/flow-engine-framework/src/main/java/com/codingapi/flow/manager/ActionManager.java
+++ b/flow-engine-framework/src/main/java/com/codingapi/flow/manager/ActionManager.java
@@ -2,6 +2,7 @@
import com.codingapi.flow.action.IFlowAction;
import com.codingapi.flow.action.actions.*;
+import com.codingapi.flow.exception.FlowStateException;
import com.codingapi.flow.exception.FlowValidationException;
import com.codingapi.flow.form.FlowForm;
import com.codingapi.flow.node.IFlowNode;
@@ -9,6 +10,7 @@
import com.codingapi.flow.node.nodes.EndNode;
import com.codingapi.flow.node.nodes.HandleNode;
import com.codingapi.flow.node.nodes.StartNode;
+import com.codingapi.flow.record.FlowRecord;
import com.codingapi.flow.session.FlowAdvice;
import com.codingapi.flow.session.FlowSession;
import com.codingapi.flow.workflow.Workflow;
@@ -146,6 +148,10 @@ public void verifySession(FlowSession session) {
}
IFlowNode backNode = flowAdvice.getBackNode();
IFlowNode currentNode = session.getCurrentNode();
+ // 开始节点没有任何历史节点,不存在可退回目标,直接拒绝(issue #270)
+ if (StartNode.NODE_TYPE.equals(currentNode.getType())) {
+ throw FlowStateException.nodeNotSupportReturn();
+ }
if (currentNode.equals(backNode)) {
throw FlowValidationException.required("backNode");
}
@@ -159,10 +165,38 @@ public void verifySession(FlowSession session) {
|| backNode.getType().equals(HandleNode.NODE_TYPE))) {
throw FlowValidationException.required("backNode");
}
+ // 退回目标必须是当前记录真实执行过的历史节点:
+ // 并行、条件分支中"结构上不是下游但实际没走过"的节点同样不可退回(issue #270)
+ verifyBackNodeExecuted(session, backNode);
}
}
+ /**
+ * 校验退回目标是否为当前记录真实执行过的历史节点。
+ *
+ *
仅靠“目标不是当前节点的下游”不足以约束退回:并行、条件分支里存在“不是下游但从未执行”的节点,
+ * 跳转到此类节点会让流程进入未走过的路径。这里以当前记录之前的历史记录为唯一依据,
+ * 与详情接口输出的可退回节点({@code FlowContent.backNodes})保持同一口径(issue #270)。
+ *
+ * @param session 当前会话
+ * @param backNode 退回目标节点
+ */
+ private void verifyBackNodeExecuted(FlowSession session, IFlowNode backNode) {
+ FlowRecord currentRecord = session.getCurrentRecord();
+ if (currentRecord == null) {
+ throw FlowValidationException.required("backNode");
+ }
+ boolean executed = session.getRepositoryHolder()
+ .getFlowRecordService()
+ .findFlowRecordBeforeRecords(currentRecord.getProcessId(), currentRecord.getId())
+ .stream()
+ .anyMatch(record -> backNode.getId().equals(record.getNodeId()));
+ if (!executed) {
+ throw FlowStateException.backNodeNotInHistory(backNode.getId());
+ }
+ }
+
/**
* 校验审批意见是否必填。
*
diff --git a/flow-engine-framework/src/main/java/com/codingapi/flow/node/helper/BackNodeHelper.java b/flow-engine-framework/src/main/java/com/codingapi/flow/node/helper/BackNodeHelper.java
index 32f82a5b..16d50298 100644
--- a/flow-engine-framework/src/main/java/com/codingapi/flow/node/helper/BackNodeHelper.java
+++ b/flow-engine-framework/src/main/java/com/codingapi/flow/node/helper/BackNodeHelper.java
@@ -4,32 +4,39 @@
import com.codingapi.flow.node.nodes.ApprovalNode;
import com.codingapi.flow.node.nodes.HandleNode;
import com.codingapi.flow.node.nodes.StartNode;
+import com.codingapi.flow.record.FlowRecord;
import com.codingapi.flow.workflow.Workflow;
import lombok.Getter;
import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.HashSet;
import java.util.List;
+import java.util.Set;
public class BackNodeHelper {
+ /**
+ * 允许作为退回目标的节点类型:只有会产生真实审批记录的节点才可退回,
+ * 抄送、子流程、路由等节点退出时会静默停滞,不参与退回。
+ */
+ private static final Set BACK_NODE_TYPES = Set.of(
+ StartNode.NODE_TYPE,
+ ApprovalNode.NODE_TYPE,
+ HandleNode.NODE_TYPE);
+
private final Workflow workflow;
private final IFlowNode currentNode;
@Getter
private final List backNodes;
- private final List backNodeTypes = new ArrayList<>();
-
public BackNodeHelper(Workflow workflow, IFlowNode currentNode) {
this.workflow = workflow;
this.currentNode = currentNode;
this.backNodes = new ArrayList<>();
- this.backNodeTypes.add(StartNode.NODE_TYPE);
- this.backNodeTypes.add(ApprovalNode.NODE_TYPE);
- this.backNodeTypes.add(HandleNode.NODE_TYPE);
-
IFlowNode startNode = workflow.getStartNode();
this.backNodes.add(startNode);
@@ -41,7 +48,7 @@ private void fetchBackNodes(IFlowNode targetNode) {
List nextNodes = workflow.nextNodes(targetNode);
if (!nextNodes.contains(currentNode)) {
for (IFlowNode nextNode : nextNodes) {
- if (this.backNodeTypes.contains(nextNode.getType())) {
+ if (BACK_NODE_TYPES.contains(nextNode.getType())) {
this.backNodes.add(nextNode);
}
this.fetchBackNodes(nextNode);
@@ -49,4 +56,50 @@ private void fetchBackNodes(IFlowNode targetNode) {
}
}
+ /**
+ * 按真实执行历史计算可退回节点。
+ *
+ * 退回只能回到当前记录实际经过的节点,因此候选来源是当前记录之前的历史记录,
+ * 而不是流程定义的全量节点(issue #270):
+ *
+ * - 历史记录按记录 id 正序排列后倒序遍历,保证“最近经过的节点”排在第一位
+ * (例如停留在 C 节点时得到 B、A);
+ * - 同一节点多次执行(退回后重新提交)只保留最近一次,避免重复选项;
+ * - 当前节点自身不可作为退回目标,未执行过的分支节点自然不会出现。
+ *
+ *
+ * @param workflow 当前流程定义
+ * @param beforeRecords 当前记录之前的历史记录(可乱序)
+ * @param currentNodeId 当前记录所在节点 id
+ * @return 可退回节点,最近优先
+ */
+ public static List historyBackNodes(Workflow workflow,
+ List beforeRecords,
+ String currentNodeId) {
+ if (beforeRecords == null || beforeRecords.isEmpty()) {
+ return new ArrayList<>();
+ }
+ List sortedRecords = beforeRecords.stream()
+ .sorted(Comparator.comparingLong(FlowRecord::getId))
+ .toList();
+
+ List historyBackNodes = new ArrayList<>();
+ Set visitedNodeIds = new HashSet<>();
+ for (int i = sortedRecords.size() - 1; i >= 0; i--) {
+ String nodeId = sortedRecords.get(i).getNodeId();
+ if (!visitedNodeIds.add(nodeId)) {
+ continue;
+ }
+ if (nodeId.equals(currentNodeId)) {
+ continue;
+ }
+ IFlowNode node = workflow.getFlowNode(nodeId);
+ if (node == null || !BACK_NODE_TYPES.contains(node.getType())) {
+ continue;
+ }
+ historyBackNodes.add(node);
+ }
+ return historyBackNodes;
+ }
+
}
diff --git a/flow-engine-framework/src/main/java/com/codingapi/flow/pojo/response/FlowContent.java b/flow-engine-framework/src/main/java/com/codingapi/flow/pojo/response/FlowContent.java
index 183770ef..2be97fc9 100644
--- a/flow-engine-framework/src/main/java/com/codingapi/flow/pojo/response/FlowContent.java
+++ b/flow-engine-framework/src/main/java/com/codingapi/flow/pojo/response/FlowContent.java
@@ -1,5 +1,6 @@
package com.codingapi.flow.pojo.response;
+import com.codingapi.flow.action.ActionType;
import com.codingapi.flow.action.IFlowAction;
import com.codingapi.flow.form.FlowForm;
import com.codingapi.flow.form.permission.FormFieldPermission;
@@ -176,6 +177,15 @@ public class FlowContent {
*/
private List nodes;
+ /**
+ * 可退回节点。
+ *
+ * 只包含当前记录真实执行过的历史节点(剔除当前节点),并按“最近经过的节点”优先排序,
+ * 供退回弹框直接渲染候选列表;为空表示当前记录没有可退回的节点(如开始节点)。
+ * 与 {@link #nodes} 的全量流程定义节点区分,避免前端从定义节点中截取导致越界选择(issue #270)。
+ */
+ private List backNodes;
+
/**
* 支持撤销
*/
@@ -227,7 +237,7 @@ public void pushCurrentNode(FlowSession flowSession) {
if (currentNode != null) {
ActionManager actionManager = currentNode.actionManager();
NodeStrategyManager strategyManager = currentNode.strategyManager();
- this.actions = toActionMaps(actionManager.filterActions(flowSession));
+ this.actions = filterUnsupportedActions(toActionMaps(actionManager.filterActions(flowSession)));
this.actionList = toActionMaps(actionManager.getActions());
this.adviceRequired = strategyManager.isAdviceRequired();
this.signRequired = strategyManager.isSignRequired();
@@ -244,6 +254,25 @@ public void pushCurrentNode(FlowSession flowSession) {
}
}
+ /**
+ * 过滤当前不可执行的按钮。
+ *
+ * 没有任何可退回节点时(开始节点或流程首个节点),退回动作不应出现在展示按钮集合中,
+ * 否则会出现“按钮可点但提交必然失败”的错误交互(issue #270)。
+ * {@link #actionList} 仍保留节点配置的全部按钮,前端按展示集合自行隐藏。
+ *
+ * @param actions 节点过滤后的展示动作
+ * @return 过滤后的展示动作
+ */
+ private List