fix flow bug

xlorne · xlorne · commit 4e7ca69a8469 · 2025-07-28T20:42:10.000+08:00
diff --git a/pom.xml b/pom.xml
@@ -15,7 +15,7 @@
 
     <groupId>com.codingapi.springboot</groupId>
     <artifactId>springboot-parent</artifactId>
-    <version>2.10.11</version>
+    <version>2.10.12</version>
 
     <url>https://github.com/codingapi/springboot-framewrok</url>
     <name>springboot-parent</name>
diff --git a/springboot-starter-data-authorization/pom.xml b/springboot-starter-data-authorization/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>2.10.11</version>
+        <version>2.10.12</version>
     </parent>
 
     <name>springboot-starter-data-authorization</name>
diff --git a/springboot-starter-data-fast/pom.xml b/springboot-starter-data-fast/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>2.10.11</version>
+        <version>2.10.12</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/springboot-starter-flow/pom.xml b/springboot-starter-flow/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>2.10.11</version>
+        <version>2.10.12</version>
     </parent>
 
     <name>springboot-starter-flow</name>
diff --git a/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/domain/FlowWork.java b/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/domain/FlowWork.java
@@ -309,8 +309,10 @@ public FlowNode getStartNode() {
     /**
      * 是否存在退回关系
      */
-    public boolean hasBackRelation() {
-        return relations.stream().anyMatch(FlowRelation::isBack);
+    public boolean hasBackRelation(String sourceCode) {
+        return relations.stream()
+                .filter(relation -> relation.getSource().getCode().equals(sourceCode))
+                .anyMatch(FlowRelation::isBack);
     }
 
 
diff --git a/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/service/FlowNodeService.java b/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/service/FlowNodeService.java
@@ -102,7 +102,29 @@ public void skipCirculate() {
     /**
      * 加载默认回退节点
      */
-    public void loadDefaultBackNode(FlowRecord currentRecord) {
+    public void loadDefaultBackNode(FlowNode flowNode,FlowRecord currentRecord) {
+        // 如果退回设置了回退关系，则需要根据关系匹配下一个节点
+        if (flowWork.hasBackRelation(flowNode.getCode())) {
+            FlowNode nextNode = this.matcherNextNode(flowNode, true);
+            if (nextNode == null) {
+                throw new IllegalArgumentException("next node not found");
+            }
+            long parentRecordId = currentRecord.getPreId();
+            FlowRecord preFlowRecord = flowRecordRepository.getFlowRecordById(parentRecordId);
+            IFlowOperator flowOperator = currentOperator;
+            if (nextNode.isAnyOperatorMatcher()) {
+                while (preFlowRecord.isTransfer() || !preFlowRecord.getNodeCode().equals(nextNode.getCode())) {
+                    preFlowRecord = flowRecordRepository.getFlowRecordById(preFlowRecord.getPreId());
+                }
+                flowOperator = preFlowRecord.getCurrentOperator();
+            }
+            this.nextNode = nextNode;
+            this.nextOperator = flowOperator;
+            this.backOperator = null;
+            return;
+        }
+
+        // 如果没有设置回退关系，则需要根据流程记录来匹配下一个节点
         List<FlowRecord> historyRecords =
                 flowRecordRepository.findFlowRecordByProcessId(currentRecord.getProcessId())
                         .stream()
diff --git a/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/service/impl/FlowSubmitService.java b/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/service/impl/FlowSubmitService.java
@@ -193,7 +193,7 @@ private void loadNextNode(List<FlowRecord> historyRecords) {
         if (flowDirectionService.isPassRecord()) {
             flowNodeService.loadNextPassNode(flowNode);
         } else  {
-            flowNodeService.loadDefaultBackNode(flowRecord);
+            flowNodeService.loadDefaultBackNode(flowNode,flowRecord);
         }
         this.nextNode = flowNodeService.getNextNode();
     }
diff --git a/springboot-starter-flow/src/test/java/com/codingapi/springboot/flow/test/FlowRejectTest.java b/springboot-starter-flow/src/test/java/com/codingapi/springboot/flow/test/FlowRejectTest.java
@@ -239,4 +239,220 @@ void reject2() {
 
     }
 
+
+
+    /**
+     * 驳回测试3
+     */
+    @Test
+    void reject3() {
+        PageRequest pageRequest = PageRequest.of(0, 1000);
+
+        User lorne = new User("lorne");
+        userRepository.save(lorne);
+
+        User user = new User("张飞");
+        userRepository.save(user);
+
+        User dept = new User("刘备");
+        userRepository.save(dept);
+
+        User boss = new User("诸葛亮");
+        userRepository.save(boss);
+
+        FlowWork flowWork = FlowWorkBuilder.builder(user)
+                .title("请假流程")
+                .nodes()
+                .node("开始节点", "start", "default", ApprovalType.UN_SIGN, OperatorMatcher.anyOperatorMatcher())
+                .node("部门领导审批", "dept", "default", ApprovalType.SIGN, OperatorMatcher.specifyOperatorMatcher(dept.getUserId()))
+                .node("总经理审批", "manager", "default", ApprovalType.SIGN, OperatorMatcher.specifyOperatorMatcher(boss.getUserId()))
+                .node("结束节点", "over", "default", ApprovalType.UN_SIGN, OperatorMatcher.anyOperatorMatcher())
+                .relations()
+                .relation("部门领导审批", "start", "dept")
+                .relation("总经理审批", "dept", "manager")
+                .relation("总经理审批", "manager", "start",new OutTrigger("" +
+                        "def run(content) {\n" +
+                        "                            if(content.getBindData().getDays() > 3) {\n" +
+                        "                                return true;\n" +
+                        "                            }\n" +
+                        "                            return false;\n" +
+                        "                        }"),1,true)
+                .relation("结束节点", "manager", "over")
+                .build();
+
+        flowWorkRepository.save(flowWork);
+
+        String workCode = flowWork.getCode();
+
+        Leave leave = new Leave("我要出去看看");
+        leave.setDays(5);
+        leaveRepository.save(leave);
+
+        // 创建流程
+        flowService.startFlow(workCode, user, leave, "发起流程");
+
+        // 查看我的待办
+        List<FlowRecord> userTodos = flowRecordRepository.findTodoByOperatorId(user.getUserId(), pageRequest).getContent();
+        assertEquals(1, userTodos.size());
+
+        // 提交流程
+        FlowRecord userTodo = userTodos.get(0);
+        assertEquals(0, userTodo.getTimeoutTime());
+
+        flowService.submitFlow(userTodo.getId(), user, leave, Opinion.pass("同意").specify(dept.getUserId()));
+
+        // 查看刘备经理的待办
+        List<FlowRecord> deptTodos = flowRecordRepository.findTodoByOperatorId(dept.getUserId(), pageRequest).getContent();
+        assertEquals(1, deptTodos.size());
+
+        // 部门经理的提交审批
+        FlowRecord deptTodo = deptTodos.get(0);
+        flowService.submitFlow(deptTodo.getId(), dept, leave, Opinion.pass("同意"));
+
+        // 查看总经理的待办
+        List<FlowRecord> bossTodos = flowRecordRepository.findTodoByOperatorId(boss.getUserId(), pageRequest).getContent();
+        assertEquals(1, bossTodos.size());
+
+        // 提交总经理的审批
+        FlowRecord bossTodo = bossTodos.get(0);
+        flowService.submitFlow(bossTodo.getId(), boss, leave, Opinion.reject("不同意"));
+
+        deptTodos = flowRecordRepository.findTodoByOperatorId(dept.getUserId(), pageRequest).getContent();
+        assertEquals(0, deptTodos.size());
+
+        userTodos = flowRecordRepository.findTodoByOperatorId(user.getUserId(), pageRequest).getContent();
+        assertEquals(1, bossTodos.size());
+
+        userTodo = userTodos.get(0);
+        leave.setDays(3);
+        flowService.submitFlow(userTodo.getId(), user, leave, Opinion.pass("同意"));
+
+        // 查看所有流程
+        List<FlowRecord> records = flowRecordRepository.findAll(pageRequest).getContent();
+        assertEquals(5, records.size());
+
+        deptTodos = flowRecordRepository.findTodoByOperatorId(dept.getUserId(), pageRequest).getContent();
+        assertEquals(1, deptTodos.size());
+
+        // 部门经理的提交审批
+        deptTodo = deptTodos.get(0);
+        flowService.submitFlow(deptTodo.getId(), dept, leave, Opinion.pass("同意"));
+
+        bossTodos = flowRecordRepository.findTodoByOperatorId(boss.getUserId(), pageRequest).getContent();
+        assertEquals(1, bossTodos.size());
+
+        // 提交总经理的审批
+        bossTodo = bossTodos.get(0);
+        flowService.submitFlow(bossTodo.getId(), boss, leave, Opinion.pass("同意"));
+
+        records = flowRecordRepository.findAll(pageRequest).getContent();
+        assertEquals(6, records.size());
+        // 查看所有流程是否都已经结束
+        assertTrue(records.stream().allMatch(FlowRecord::isFinish));
+
+        List<BindDataSnapshot> snapshots = flowBindDataRepository.findAll();
+        assertEquals(7, snapshots.size());
+
+    }
+
+
+
+    /**
+     *  多条件流程测试撤回
+     */
+    @Test
+    void reject4(){
+        PageRequest pageRequest = PageRequest.of(0, 1000);
+
+        User user = new User("张飞");
+        userRepository.save(user);
+
+        User dept = new User("刘备");
+        userRepository.save(dept);
+
+        User boss = new User("诸葛亮");
+        userRepository.save(boss);
+
+
+        FlowWork flowWork = FlowWorkBuilder.builder(user)
+                .title("请假流程")
+                .nodes()
+                .node("开始节点", "start", "default", ApprovalType.UN_SIGN, OperatorMatcher.anyOperatorMatcher())
+                .node("部门领导审批", "dept", "default", ApprovalType.UN_SIGN, OperatorMatcher.specifyOperatorMatcher(dept.getUserId()))
+                .node("总经理审批", "manager", "default", ApprovalType.UN_SIGN, OperatorMatcher.specifyOperatorMatcher(boss.getUserId()))
+                .node("结束节点", "over", "default", ApprovalType.UN_SIGN, OperatorMatcher.anyOperatorMatcher())
+                .relations()
+                .relation("部门领导审批", "start", "dept")
+                .relation("总经理审批", "dept", "over",new OutTrigger("def run(content){content.getBindData().getDays()<=5}"),1,false)
+                .relation("总经理审批", "dept", "manager",new OutTrigger("def run(content){content.getBindData().getDays()>5}"),2,false)
+                .relation("结束节点", "manager", "start",new OutTrigger("def run(content){return true}"),1,true)
+                .relation("结束节点", "manager", "over")
+                .build();
+
+        flowWorkRepository.save(flowWork);
+
+        String workCode = flowWork.getCode();
+
+        Leave leave = new Leave("我要出去看看",6);
+        leaveRepository.save(leave);
+
+        // 创建流程
+        flowService.startFlow(workCode, user, leave, "发起流程");
+
+        // 查看我的待办
+        List<FlowRecord> userTodos = flowRecordRepository.findTodoByOperatorId(user.getUserId(), pageRequest).getContent();
+        assertEquals(1, userTodos.size());
+
+        // 提交流程
+        FlowRecord userTodo = userTodos.get(0);
+        flowService.submitFlow(userTodo.getId(), user, leave, Opinion.pass("同意"));
+
+        // 查看部门经理的待办
+        List<FlowRecord> deptTodos = flowRecordRepository.findTodoByOperatorId(dept.getUserId(), pageRequest).getContent();
+        assertEquals(1, deptTodos.size());
+
+        // 提交部门经理的审批
+        FlowRecord deptTodo = deptTodos.get(0);
+        flowService.submitFlow(deptTodo.getId(), dept, leave, Opinion.pass("同意"));
+
+
+        // 查看老板的待办
+        List<FlowRecord> bossTodos = flowRecordRepository.findTodoByOperatorId(boss.getUserId(), pageRequest).getContent();
+        assertEquals(1, bossTodos.size());
+
+        // 提交老板的审批
+        FlowRecord bossTodo = bossTodos.get(0);
+        flowService.submitFlow(bossTodo.getId(), boss, leave, Opinion.reject("不同意，最多让你请假3天"));
+
+        // 查看所有流程
+        List<FlowRecord> records = flowRecordRepository.findAll(pageRequest).getContent();
+        assertEquals(4, records.size());
+
+        // 用户修改确认
+        userTodos = flowRecordRepository.findTodoByOperatorId(user.getUserId(), pageRequest).getContent();
+        assertEquals(1, userTodos.size());
+
+        // 用户调整为3天
+        leave.setDays(3);
+        // 提交流程
+        userTodo = userTodos.get(0);
+        flowService.submitFlow(userTodo.getId(), user, leave, Opinion.pass("同意"));
+
+        deptTodos = flowRecordRepository.findTodoByOperatorId(dept.getUserId(), pageRequest).getContent();
+        assertEquals(1, deptTodos.size());
+
+        // 提交部门经理的审批
+        deptTodo = deptTodos.get(0);
+        flowService.submitFlow(deptTodo.getId(), dept, leave, Opinion.pass("同意"));
+
+        records = flowRecordRepository.findAll(pageRequest).getContent();
+        assertEquals(5, records.size());
+
+        // 查看所有流程是否都已经结束
+        assertTrue(records.stream().allMatch(FlowRecord::isFinish));
+
+        List<BindDataSnapshot> snapshots = flowBindDataRepository.findAll();
+        assertEquals(6, snapshots.size());
+    }
+
 }
diff --git a/springboot-starter-flow/src/test/java/com/codingapi/springboot/flow/test/MultiRelationFlowTest.java b/springboot-starter-flow/src/test/java/com/codingapi/springboot/flow/test/MultiRelationFlowTest.java
diff --git a/springboot-starter-security/pom.xml b/springboot-starter-security/pom.xml
diff --git a/springboot-starter/pom.xml b/springboot-starter/pom.xml
diff --git a/springboot-starter/src/main/resources/META-INF/banner.txt b/springboot-starter/src/main/resources/META-INF/banner.txt

Original file line number	Diff line number	Diff line change
`@@ -193,7 +193,7 @@ private void loadNextNode(List<FlowRecord> historyRecords) {`
`193`	`193`	`if (flowDirectionService.isPassRecord()) {`
`194`	`194`	`flowNodeService.loadNextPassNode(flowNode);`
`195`	`195`	`} else {`
`196`		`- flowNodeService.loadDefaultBackNode(flowRecord);`
	`196`	`+ flowNodeService.loadDefaultBackNode(flowNode,flowRecord);`
`197`	`197`	`}`
`198`	`198`	`this.nextNode = flowNodeService.getNextNode();`
`199`	`199`	`}`