codingapi · xlorne · Jul 28, 2025 · Jul 28, 2025
diff --git a/example/example-app/example-app-cmd-domain/pom.xml b/example/example-app/example-app-cmd-domain/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>example-app</artifactId>
-        <version>3.4.11</version>
+        <version>3.4.12</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/example/example-app/example-app-cmd-meta/pom.xml b/example/example-app/example-app-cmd-meta/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>example-app</artifactId>
-        <version>3.4.11</version>
+        <version>3.4.12</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/example/example-app/example-app-query/pom.xml b/example/example-app/example-app-query/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>example-app</artifactId>
-        <version>3.4.11</version>
+        <version>3.4.12</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/example/example-app/pom.xml b/example/example-app/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>springboot-example</artifactId>
-        <version>3.4.11</version>
+        <version>3.4.12</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>pom</packaging>

diff --git a/example/example-domain/example-domain-leave/pom.xml b/example/example-domain/example-domain-leave/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>example-domain</artifactId>
-        <version>3.4.11</version>
+        <version>3.4.12</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/example/example-domain/example-domain-user/pom.xml b/example/example-domain/example-domain-user/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>example-domain</artifactId>
-        <version>3.4.11</version>
+        <version>3.4.12</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/example/example-domain/pom.xml b/example/example-domain/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>springboot-example</artifactId>
-       <version>3.4.11</version>
+       <version>3.4.12</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/example/example-infra/example-infra-flow/pom.xml b/example/example-infra/example-infra-flow/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>example-infra</artifactId>
-       <version>3.4.11</version>
+       <version>3.4.12</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/example/example-infra/example-infra-jpa/pom.xml b/example/example-infra/example-infra-jpa/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>example-infra</artifactId>
-        <version>3.4.11</version>
+        <version>3.4.12</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/example/example-infra/example-infra-security/pom.xml b/example/example-infra/example-infra-security/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>example-infra</artifactId>
-        <version>3.4.11</version>
+        <version>3.4.12</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/example/example-infra/pom.xml b/example/example-infra/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>springboot-example</artifactId>
-        <version>3.4.11</version>
+        <version>3.4.12</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>pom</packaging>

diff --git a/example/example-interface/pom.xml b/example/example-interface/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>springboot-example</artifactId>
-        <version>3.4.11</version>
+        <version>3.4.12</version>
     </parent>
 
     <artifactId>example-interface</artifactId>

diff --git a/example/example-server/pom.xml b/example/example-server/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-       <version>3.4.11</version>
+       <version>3.4.12</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/example/pom.xml b/example/pom.xml
@@ -19,7 +19,7 @@
     </parent>
 
     <artifactId>springboot-example</artifactId>
-    <version>3.4.11</version>
+    <version>3.4.12</version>
 
     <name>springboot-example</name>
     <description>springboot-example project for Spring Boot</description>

diff --git a/pom.xml b/pom.xml
@@ -12,7 +12,7 @@
 
     <groupId>com.codingapi.springboot</groupId>
     <artifactId>springboot-parent</artifactId>
-    <version>3.4.11</version>
+    <version>3.4.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>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>springboot-parent</artifactId>
-       <version>3.4.11</version>
+       <version>3.4.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>3.4.11</version>
+       <version>3.4.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>3.4.11</version>
+       <version>3.4.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
@@ -310,8 +310,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/...tarter-flow/src/main/java/com/codingapi/springboot/flow/service/FlowDirectionService.java b/...tarter-flow/src/main/java/com/codingapi/springboot/flow/service/FlowDirectionService.java
@@ -92,5 +92,4 @@ public boolean isPassRecord() {
         return flowSourceDirection == FlowSourceDirection.PASS;
     }
 
-
 }
diff --git a/...oot-starter-flow/src/main/java/com/codingapi/springboot/flow/service/FlowNodeService.java b/...oot-starter-flow/src/main/java/com/codingapi/springboot/flow/service/FlowNodeService.java
@@ -100,39 +100,60 @@ 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()
                         .sorted((o1, o2) -> (int) (o2.getId() - o1.getId()))
                         .filter(record -> record.getId() < currentRecord.getId())
                         .toList();
-
         int index = 0;
         while (true) {
             if (index >= historyRecords.size()) {
                 throw new IllegalArgumentException("back node not found");
             }
             FlowRecord record = historyRecords.get(index);
-            if (record.isDone() && record.getId()== currentRecord.getPreId()) {
+            if (record.isDone() && record.getId() == currentRecord.getPreId()) {
                 // 是连续的回退节点时，则根据流程记录的状态来判断
-                if(record.isReject()){
+                if (record.isReject()) {
                     boolean startRemove = false;
-                    for(FlowRecord historyRecord: historyRecords){
-                        if(startRemove){
-                            if(historyRecord.getNodeCode().equals(currentRecord.getNodeCode())){
+                    for (FlowRecord historyRecord : historyRecords) {
+                        if (startRemove) {
+                            if (historyRecord.getNodeCode().equals(currentRecord.getNodeCode())) {
                                 continue;
                             }
                             this.nextNode = flowWork.getNodeByCode(historyRecord.getNodeCode());
                             this.nextOperator = historyRecord.getCurrentOperator();
                             this.backOperator = historyRecord.getCurrentOperator();
                             return;
                         }
-                        if(historyRecord.getNodeCode().equals(currentRecord.getNodeCode())){
+                        if (historyRecord.getNodeCode().equals(currentRecord.getNodeCode())) {
                             startRemove = true;
                         }
                     }
-                }else {
+                } else {
                     this.nextNode = flowWork.getNodeByCode(record.getNodeCode());
                     this.nextOperator = record.getCurrentOperator();
                     this.backOperator = record.getCurrentOperator();
@@ -144,23 +165,22 @@ public void loadDefaultBackNode(FlowRecord currentRecord) {
     }
 
 
-
     /**
      * 获取下一个节点
      *
      * @return 下一个节点
      */
     private FlowNode matcherNextNode(FlowNode flowNode, boolean back) {
         List<FlowRelation> currentRelations = new ArrayList<>(flowWork.getRelations());
-        if(back){
+        if (back) {
             String preCode = FlowNode.CODE_START;
-            if(flowRecord.getPreId()!=0){
+            if (flowRecord.getPreId() != 0) {
                 FlowRecord preRecord = flowRecordRepository.getFlowRecordById(flowRecord.getPreId());
-                if(preRecord!=null){
+                if (preRecord != null) {
                     preCode = preRecord.getNodeCode();
-                    while (preCode.equals(flowRecord.getNodeCode())){
+                    while (preCode.equals(flowRecord.getNodeCode())) {
                         preRecord = flowRecordRepository.getFlowRecordById(preRecord.getPreId());
-                        if(preRecord==null){
+                        if (preRecord == null) {
                             break;
                         }
                         preCode = preRecord.getNodeCode();

diff --git a/...rter-flow/src/main/java/com/codingapi/springboot/flow/service/impl/FlowSubmitService.java b/...rter-flow/src/main/java/com/codingapi/springboot/flow/service/impl/FlowSubmitService.java
@@ -192,7 +192,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();
     }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -92,5 +92,4 @@ public boolean isPassRecord() {
		return flowSourceDirection == FlowSourceDirection.PASS;
		}


		}