Skip to content

Commit c233b61

Browse files
committed
fix: 退回时自动办结同节点其他待办,避免重复待办 (#255)
退回动作只更新了当前记录,多人审批(或签/并签)同节点的其他待办未被清理: 流程视图仍停留在该节点,发起人重新提交后同流程会出现重复待办。 - BaseAction 新增 autoDoneSiblingTodos,统一自动办结同节点其他待办(限定同一流程实例) - ReturnAction 复用该方法,并改为先保存本节点状态再生成退回目标节点记录 - RejectAction 改用公共方法,行为保持不变(#235) - 新增 FlowIssue255AnyAuditReturnTest,覆盖或签退回与并签退回场景 Closes #255
1 parent 2c04863 commit c233b61

4 files changed

Lines changed: 367 additions & 7 deletions

File tree

‎flow-engine-framework/src/main/java/com/codingapi/flow/action/BaseAction.java‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.codingapi.flow.action;
22

33
import com.codingapi.flow.common.IMapConvertor;
4+
import com.codingapi.flow.event.FlowRecordDoneEvent;
45
import com.codingapi.flow.event.FlowRecordTodoEvent;
56
import com.codingapi.flow.event.IFlowEvent;
67
import com.codingapi.flow.node.IFlowNode;
@@ -120,6 +121,42 @@ protected boolean isEndNodeTodoEvent(IFlowEvent event) {
120121
&& !todoEvent.getFlowRecord().isNotEndNode();
121122
}
122123

124+
/**
125+
* 将当前节点实例中其他未办理的待办记录自动办结。
126+
*
127+
* <p>退回({@link com.codingapi.flow.action.actions.ReturnAction})、拒绝
128+
* ({@link com.codingapi.flow.action.actions.RejectAction})意味着当前节点就此结束,
129+
* 同节点其他审批人(或签/并签的候选审批人)的待办不能继续办理:否则会遗留待办,
130+
* 流程视图仍停留在当前节点,发起人重新提交后还会出现同流程的重复待办(issue #235 / #255)。
131+
*
132+
* <p>自动办结采用 {@link FlowRecord#autoDone()}:记录置为已办但不带审批动作,
133+
* 展示层标记为「自动跳过」,与或签/并签节点完成后遗留待办的处理口径一致。
134+
* 仅处理同一流程实例内的记录,避免仓储按 {@code (fromId, nodeId)} 查询时误伤其他流程实例。
135+
*
136+
* @param flowSession 当前会话,同节点记录取自 {@link FlowSession#getCurrentNodeRecords()}
137+
* @param recordList 待保存的记录集合,自动办结的记录会追加其中
138+
* @param flowEvents 待推送的事件集合,每条自动办结记录都会追加一条已办事件
139+
*/
140+
protected void autoDoneSiblingTodos(FlowSession flowSession,
141+
List<FlowRecord> recordList,
142+
List<IFlowEvent> flowEvents) {
143+
FlowRecord currentRecord = flowSession.getCurrentRecord();
144+
for (FlowRecord record : flowSession.getCurrentNodeRecords()) {
145+
if (record.getId() == currentRecord.getId()) {
146+
continue;
147+
}
148+
if (!record.isTodo()) {
149+
continue;
150+
}
151+
if (!currentRecord.getProcessId().equals(record.getProcessId())) {
152+
continue;
153+
}
154+
record.autoDone();
155+
recordList.add(record);
156+
flowEvents.add(new FlowRecordDoneEvent(record, flowSession.isMock()));
157+
}
158+
}
159+
123160
/**
124161
* 触发并执行后续节点
125162
*

‎flow-engine-framework/src/main/java/com/codingapi/flow/action/actions/RejectAction.java‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -107,13 +107,7 @@ public void run(FlowSession flowSession) {
107107

108108
// 拒绝即结束当前节点:将同节点其他未办理的待办(或签/并签的其他审批人)自动置为已办。
109109
// 否则节点被退回后仍会遗留待办,审批人可继续办理,流程视图也会停留在当前节点(issue #235)。
110-
for (FlowRecord record : flowSession.getCurrentNodeRecords()) {
111-
if (record.getId() != flowRecord.getId() && record.isTodo()) {
112-
record.autoDone();
113-
recordList.add(record);
114-
flowEvents.add(new FlowRecordDoneEvent(record, flowSession.isMock()));
115-
}
116-
}
110+
this.autoDoneSiblingTodos(flowSession, recordList, flowEvents);
117111

118112
// 先保存当前记录及同节点待办的自动办结状态,再触发退回/终止节点。
119113
// 终止流程时 EndNode.fillNewRecord 会按数据库中的最新记录统一置为结束状态,

‎flow-engine-framework/src/main/java/com/codingapi/flow/action/actions/ReturnAction.java‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,15 @@ public void run(FlowSession flowSession) {
5858

5959
flowEvents.add(new FlowRecordDoneEvent(currentRecord,flowSession.isMock()));
6060

61+
// 退回即结束当前节点:同节点其他未办理的待办(或签/并签的其他审批人)一并自动置为已办。
62+
// 否则退回后仍会遗留待办,发起人重新提交到该节点时会出现同流程的重复待办(issue #255)。
63+
this.autoDoneSiblingTodos(flowSession, recordList, flowEvents);
64+
65+
// 先保存当前记录与同节点待办的自动办结状态,再生成退回目标节点的记录,
66+
// 与拒绝动作一致,避免退回目标节点的生成过程覆盖本会话中的记录状态(issue #235)
67+
repositoryHolder.saveRecords(recordList);
68+
recordList.clear();
69+
6170
List<FlowRecord> flowRecords = backNode.generateCurrentRecords(flowSession.updateSession(backNode));
6271
recordList.addAll(flowRecords);
6372

0 commit comments

Comments
 (0)