From b5d38a8e85dbacfef5a905c16424e20f8b2e7038 Mon Sep 17 00:00:00 2001 From: lorne <1991wangliang@gmail.com> Date: Tue, 10 Nov 2026 18:35:16 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=92=A4=E5=9B=9E=E6=97=B6=E5=8F=AA?= =?UTF-8?q?=E6=91=98=E9=99=A4=E8=87=AA=E8=BA=AB=E5=90=88=E5=B9=B6=E5=85=B3?= =?UTF-8?q?=E7=B3=BB=EF=BC=8C=E9=81=BF=E5=85=8D=E8=AF=AF=E5=88=A0=E5=90=8C?= =?UTF-8?q?=E7=BB=84=E5=85=B6=E4=BB=96=E6=B5=81=E7=A8=8B=E5=BE=85=E5=8A=9E?= =?UTF-8?q?=20(#260)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - FlowRecordSaveService:已办结与已撤销记录统一走 removeTodoRecord,合并组只删除本记录的关系并递减合并数量,剩余记录时刷新代表记录 - 删除合并组(组内无剩余记录)时同步清理残余合并关系,避免孤儿数据 - 新增 FlowIssue260MergeRevokeTest:覆盖 a1 撤回后保留 a2、a1 重新提交后合并组恢复为 2 条 Closes #260 --- .../flow/service/FlowRecordSaveService.java | 82 ++++--- .../service/FlowIssue260MergeRevokeTest.java | 219 ++++++++++++++++++ 2 files changed, 267 insertions(+), 34 deletions(-) create mode 100644 flow-engine-framework/src/test/java/com/codingapi/flow/service/FlowIssue260MergeRevokeTest.java diff --git a/flow-engine-framework/src/main/java/com/codingapi/flow/service/FlowRecordSaveService.java b/flow-engine-framework/src/main/java/com/codingapi/flow/service/FlowRecordSaveService.java index 03aae621..fb9aa8dd 100644 --- a/flow-engine-framework/src/main/java/com/codingapi/flow/service/FlowRecordSaveService.java +++ b/flow-engine-framework/src/main/java/com/codingapi/flow/service/FlowRecordSaveService.java @@ -137,42 +137,56 @@ private void saveRecords() { private void removeTodoMergeRecords() { for (FlowRecord flowRecord : flowRecords) { - if (flowRecord.isDone()) { - if (flowRecord.isMergeable()) { - FlowTodoRecord todoMargeRecord = flowTodoRecordRepository.getByTodoKey(flowRecord.getTodoKey()); - if (todoMargeRecord != null) { - List margeRelations = flowTodoMergeRepository.findByTodoId(todoMargeRecord.getId()); - if (margeRelations != null && !margeRelations.isEmpty()) { - for (FlowTodoMerge margeRelation : margeRelations) { - if (margeRelation.isRecord(flowRecord.getId())) { - flowTodoMergeRepository.delete(margeRelation); - todoMargeRecord.divMergeCount(); - if (todoMargeRecord.hasMergeCount()) { - // 代表记录可能正是本次办结的记录,需要重新指向组内剩余的待办记录(issue #240) - refreshTodoMergeRecord(todoMargeRecord, margeRelations, flowRecord.getId()); - flowTodoRecordRepository.save(todoMargeRecord); - } else { - flowTodoRecordRepository.delete(todoMargeRecord); - } - } - } - } - } - } else { - FlowTodoRecord flowTodoRecord = flowTodoRecordRepository.getByTodoKey(flowRecord.getTodoKey()); - if (flowTodoRecord != null) { - flowTodoRecordRepository.delete(flowTodoRecord); - } - } - }else { - if(flowRecord.isRevoked()){ - FlowTodoRecord flowTodoRecord = flowTodoRecordRepository.getByTodoKey(flowRecord.getTodoKey()); - if (flowTodoRecord != null) { - flowTodoRecordRepository.delete(flowTodoRecord); - } - } + // 已办结与已撤销都要把该记录从待办中摘除。 + // 合并待办按「合并依据 + 工作流运行时 + 节点」聚合,组内一条流程记录办结或撤销时, + // 只能摘除它自己的合并关系,不能连带删除同组其他流程记录的待办(issue #260) + if (flowRecord.isDone() || flowRecord.isRevoked()) { + removeTodoRecord(flowRecord); + } + } + } + + private void removeTodoRecord(FlowRecord flowRecord) { + FlowTodoRecord flowTodoRecord = flowTodoRecordRepository.getByTodoKey(flowRecord.getTodoKey()); + if (flowTodoRecord == null) { + return; + } + if (!flowRecord.isMergeable()) { + flowTodoRecordRepository.delete(flowTodoRecord); + return; + } + List margeRelations = flowTodoMergeRepository.findByTodoId(flowTodoRecord.getId()); + if (margeRelations == null || margeRelations.isEmpty()) { + return; + } + for (FlowTodoMerge margeRelation : margeRelations) { + if (!margeRelation.isRecord(flowRecord.getId())) { + continue; + } + flowTodoMergeRepository.delete(margeRelation); + flowTodoRecord.divMergeCount(); + if (flowTodoRecord.hasMergeCount()) { + // 代表记录可能正是本次办结/撤销的记录,需要重新指向组内剩余的待办记录(issue #240 / #260) + refreshTodoMergeRecord(flowTodoRecord, margeRelations, flowRecord.getId()); + flowTodoRecordRepository.save(flowTodoRecord); + } else { + // 组内已无剩余记录:删除待办行,并清理残余合并关系,避免留下指向已删除待办的孤儿数据 + removeTodoRecordWithRelations(flowTodoRecord); + } + } + } + + /** + * 删除合并待办行及其全部残余合并关系。 + */ + private void removeTodoRecordWithRelations(FlowTodoRecord flowTodoRecord) { + List margeRelations = flowTodoMergeRepository.findByTodoId(flowTodoRecord.getId()); + if (margeRelations != null) { + for (FlowTodoMerge margeRelation : margeRelations) { + flowTodoMergeRepository.delete(margeRelation); } } + flowTodoRecordRepository.delete(flowTodoRecord); } /** diff --git a/flow-engine-framework/src/test/java/com/codingapi/flow/service/FlowIssue260MergeRevokeTest.java b/flow-engine-framework/src/test/java/com/codingapi/flow/service/FlowIssue260MergeRevokeTest.java new file mode 100644 index 00000000..d2b91f63 --- /dev/null +++ b/flow-engine-framework/src/test/java/com/codingapi/flow/service/FlowIssue260MergeRevokeTest.java @@ -0,0 +1,219 @@ +package com.codingapi.flow.service; + +import com.codingapi.flow.action.IFlowAction; +import com.codingapi.flow.action.actions.CustomAction; +import com.codingapi.flow.builder.ActionBuilder; +import com.codingapi.flow.builder.FormFieldPermissionsBuilder; +import com.codingapi.flow.builder.NodeStrategyBuilder; +import com.codingapi.flow.context.GatewayContext; +import com.codingapi.flow.factory.MyFlowServiceFactory; +import com.codingapi.flow.form.DataType; +import com.codingapi.flow.form.FlowForm; +import com.codingapi.flow.form.FlowFormBuilder; +import com.codingapi.flow.form.permission.PermissionType; +import com.codingapi.flow.node.nodes.ApprovalNode; +import com.codingapi.flow.node.nodes.EndNode; +import com.codingapi.flow.node.nodes.StartNode; +import com.codingapi.flow.pojo.body.FlowAdviceBody; +import com.codingapi.flow.pojo.request.FlowActionRequest; +import com.codingapi.flow.pojo.request.FlowCreateRequest; +import com.codingapi.flow.pojo.request.FlowRevokeRequest; +import com.codingapi.flow.record.FlowRecord; +import com.codingapi.flow.record.FlowTodoRecord; +import com.codingapi.flow.script.factory.FlowGroovyScriptFactory; +import com.codingapi.flow.strategy.node.FormFieldPermissionStrategy; +import com.codingapi.flow.strategy.node.MultiOperatorAuditStrategy; +import com.codingapi.flow.strategy.node.OperatorLoadStrategy; +import com.codingapi.flow.strategy.node.RecordMergeStrategy; +import com.codingapi.flow.strategy.node.RevokeStrategy; +import com.codingapi.flow.user.User; +import com.codingapi.flow.workflow.Workflow; +import com.codingapi.flow.workflow.WorkflowBuilder; +import org.junit.jupiter.api.Test; + +import java.util.List; +import java.util.Map; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + +/** + * issue #260:合并审批流程由开始节点人员撤回流程时,同组其他流程的合并待办被一并删除。 + * + *

流程 A-B-D,B 为多人审批(或签,审批人 b1、b2)且开启记录合并。 + * a1、a2 两条流程在 B 节点合并为 b1、b2 各自的合并待办(组内各 2 条记录)。

+ * + *

期望:a1 撤回后,b1、b2 的合并待办仅移除 a1 的记录、保留 a2; + * a1 重新提交后,合并待办恢复为 2 条。

+ */ +public class FlowIssue260MergeRevokeTest { + + private final MyFlowServiceFactory factory = new MyFlowServiceFactory(); + + @Test + void revokeOneProcessOfMergedTodo_shouldKeepRemainingProcessAndRestoreAfterResubmit() { + // given + User a1 = new User(11, "a1"); + User a2 = new User(12, "a2"); + User b1 = new User(2, "b1"); + User b2 = new User(3, "b2"); + List.of(a1, a2, b1, b2).forEach(factory.userGateway::save); + GatewayContext.getInstance().setFlowOperatorGateway(factory.userGateway); + + Workflow workflow = buildWorkflow(a1, "issue260"); + factory.workflowService.saveWorkflow(workflow); + String bNodeId = bNodeId(workflow); + + Map data = Map.of("name", "lorne"); + + // a2 先提交、a1 后提交:合并待办的代表记录为 a1 的 B 记录,与问题现场一致 + createAndSubmit(a2, workflow, data); + long a1StartRecordId = createAndSubmit(a1, workflow, data); + + for (User approver : List.of(b1, b2)) { + FlowTodoRecord group = singleGroupOf(approver, bNodeId); + assertEquals(2, group.getMargeCount(), approver.getName() + " 的合并组应有 a1、a2 两条记录"); + assertEquals(a1.getUserId(), factory.flowRecordRepository.get(group.getRecordId()).getCreateOperatorId(), + "合并待办代表记录应为最后提交的 a1"); + } + + // when a1 撤回自己的流程 + factory.flowService.revoke(new FlowRevokeRequest(a1StartRecordId, a1.getUserId())); + + // then b1、b2 的合并待办应保留 a2,且代表记录仍指向未办理的待办 + for (User approver : List.of(b1, b2)) { + FlowTodoRecord group = singleGroupOf(approver, bNodeId); + assertEquals(1, group.getMargeCount(), approver.getName() + " 的合并组应仅剩 a2 一条记录"); + FlowRecord representative = factory.flowRecordRepository.get(group.getRecordId()); + assertNotNull(representative, approver.getName() + " 的合并代表记录应存在"); + assertEquals(a2.getUserId(), representative.getCreateOperatorId(), + approver.getName() + " 的合并代表记录应指向仍待办的 a2"); + assertTrue(representative.isTodo(), + approver.getName() + " 的合并代表记录应仍为待办,实际:" + representative.getId()); + assertEquals(1, countTodoRecords(approver, bNodeId), + approver.getName() + " 在 B 节点应仅剩 1 条待办记录"); + assertEquals(1, factory.flowTodoMergeRepository.findByTodoId(group.getId()).size(), + "合并关系应仅剩 a2 一条"); + } + // 已撤销记录的合并关系必须被清理,不能残留指向已删除待办的孤儿关系 + assertEquals(2, factory.flowTodoMergeRepository.findAll().size(), + "合并关系总数应为 b1、b2 各 1 条"); + + // when a1 重新提交 + resubmit(a1, workflow, data, a1StartRecordId); + + // then 合并待办恢复为两条 + for (User approver : List.of(b1, b2)) { + FlowTodoRecord group = singleGroupOf(approver, bNodeId); + assertEquals(2, group.getMargeCount(), approver.getName() + " 的合并组应恢复为 2 条记录"); + assertEquals(2, countTodoRecords(approver, bNodeId), + approver.getName() + " 在 B 节点应恢复为 2 条待办记录"); + } + assertEquals(2, factory.flowTodoRecordRepository.findAll().size(), + "b1、b2 应各保留 1 条合并待办组"); + } + + // ─── 辅助方法 ─── + + private FlowTodoRecord singleGroupOf(User approver, String nodeId) { + List groups = factory.flowTodoRecordRepository.findByOperatorId(approver.getUserId()).stream() + .filter(group -> nodeId.equals(group.getNodeId())) + .toList(); + assertEquals(1, groups.size(), approver.getName() + " 在合并节点应有且仅有 1 条合并待办组"); + return groups.get(0); + } + + private long countTodoRecords(User approver, String nodeId) { + return factory.flowRecordRepository.findTodoByOperator(approver.getUserId()).stream() + .filter(record -> nodeId.equals(record.getNodeId())) + .count(); + } + + private String bNodeId(Workflow workflow) { + return workflow.getNodes().stream() + .filter(node -> node.getName().equals("B审批")) + .findFirst().orElseThrow().getId(); + } + + private Workflow buildWorkflow(User createdBy, String code) { + FlowForm form = FlowFormBuilder.builder() + .name("测试流程") + .code(code) + .addField("name", "name", DataType.STRING) + .build(); + + StartNode startNode = StartNode.builder() + .strategies(NodeStrategyBuilder.builder() + .addStrategy(new FormFieldPermissionStrategy(FormFieldPermissionsBuilder.builder() + .addPermission(code, "name", PermissionType.WRITE) + .build())) + .addStrategy(new RevokeStrategy(true, RevokeStrategy.Type.REVOKE_CURRENT)) + .build()) + .actions(ActionBuilder.builder() + .addAction(CustomAction.defaultAction()) + .build()) + .build(); + + ApprovalNode bNode = ApprovalNode.builder() + .name("B审批") + .strategies(NodeStrategyBuilder.builder() + .addStrategy(new FormFieldPermissionStrategy(FormFieldPermissionsBuilder.builder() + .addPermission(code, "name", PermissionType.WRITE) + .build())) + .addStrategy(new OperatorLoadStrategy(FlowGroovyScriptFactory + .createOperatorLoadScript("def run(request){return [2,3]}").getKey())) + // 或签:b1、b2 各自持有待办记录,两条流程在各自审批人下分别合并 + .addStrategy(new MultiOperatorAuditStrategy(MultiOperatorAuditStrategy.Type.ANY, 0f)) + .addStrategy(new RecordMergeStrategy(true)) + .build()) + .build(); + + EndNode endNode = EndNode.builder().build(); + + return WorkflowBuilder.builder() + .title("测试流程") + .code(code) + .createdOperator(createdBy) + .form(form) + .addNode(startNode) + .addNode(bNode) + .addNode(endNode) + .build(); + } + + /** + * 发起并提交到 B 节点,返回发起节点记录id + */ + private long createAndSubmit(User user, Workflow workflow, Map data) { + StartNode startNode = (StartNode) workflow.getStartNode(); + IFlowAction startAction = startNode.actionManager().getActions().get(0); + + FlowCreateRequest createRequest = new FlowCreateRequest(); + createRequest.setWorkCode(workflow.getCode()); + createRequest.setFormData(data); + createRequest.setActionId(startAction.id()); + createRequest.setOperatorId(user.getUserId()); + long recordId = factory.flowService.create(createRequest); + + submit(startAction, user, data, recordId); + return recordId; + } + + /** + * 撤回后发起记录回到待办,重新提交 + */ + private void resubmit(User user, Workflow workflow, Map data, long startRecordId) { + StartNode startNode = (StartNode) workflow.getStartNode(); + IFlowAction startAction = startNode.actionManager().getActions().get(0); + submit(startAction, user, data, startRecordId); + } + + private void submit(IFlowAction action, User user, Map data, long recordId) { + FlowActionRequest actionRequest = new FlowActionRequest(); + actionRequest.setFormData(data); + actionRequest.setRecordId(recordId); + actionRequest.setAdvice(new FlowAdviceBody(action.id(), "同意", user.getUserId())); + factory.flowService.action(actionRequest); + } +}