Dev

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.10</version>
+        <version>3.4.11</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

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.10</version>
+        <version>3.4.11</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

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.10</version>
+        <version>3.4.11</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

example/example-app/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>springboot-example</artifactId>
-        <version>3.4.10</version>
+        <version>3.4.11</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>pom</packaging>

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.10</version>
+        <version>3.4.11</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

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.10</version>
+        <version>3.4.11</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

example/example-domain/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>springboot-example</artifactId>
-       <version>3.4.10</version>
+       <version>3.4.11</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

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.10</version>
+       <version>3.4.11</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

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.10</version>
+        <version>3.4.11</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

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.10</version>
+        <version>3.4.11</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

example/example-infra/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>springboot-example</artifactId>
-        <version>3.4.10</version>
+        <version>3.4.11</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>pom</packaging>

example/example-interface/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>springboot-example</artifactId>
-        <version>3.4.10</version>
+        <version>3.4.11</version>
     </parent>
 
     <artifactId>example-interface</artifactId>

example/example-server/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-       <version>3.4.10</version>
+       <version>3.4.11</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

example/pom.xml

@@ -19,7 +19,7 @@
     </parent>
 
     <artifactId>springboot-example</artifactId>
-    <version>3.4.10</version>
+    <version>3.4.11</version>
 
     <name>springboot-example</name>
     <description>springboot-example project for Spring Boot</description>

pom.xml

@@ -12,7 +12,7 @@
 
     <groupId>com.codingapi.springboot</groupId>
     <artifactId>springboot-parent</artifactId>
-    <version>3.4.10</version>
+    <version>3.4.11</version>
 
     <url>https://github.com/codingapi/springboot-framewrok</url>
     <name>springboot-parent</name>

springboot-starter-data-authorization/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>springboot-parent</artifactId>
-       <version>3.4.10</version>
+       <version>3.4.11</version>
     </parent>
 
     <name>springboot-starter-data-authorization</name>

springboot-starter-data-fast/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-       <version>3.4.10</version>
+       <version>3.4.11</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

springboot-starter-flow/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-       <version>3.4.10</version>
+       <version>3.4.11</version>
     </parent>
 
     <name>springboot-starter-flow</name>

springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/service/FlowDirectionService.java

@@ -85,38 +85,12 @@ public boolean hasCurrentFlowNodeIsDone() {
         return historyRecords.stream().filter(item -> !item.isTransfer()).allMatch(FlowRecord::isDone);
     }
 
-
-    /**
-     * 检测当前流程是否已经完成
-     * 即流程已经进行到了最终节点且审批意见为同意
-     */
-    public boolean hasCurrentFlowIsFinish() {
-        if (flowSourceDirection == FlowSourceDirection.PASS && flowNode.isOverNode()) {
-            return true;
-        }
-        return false;
-    }
-
-
-    /**
-     * 判断当前流程是否为默认的驳回流程
-     */
-    public boolean isDefaultBackRecord() {
-        return flowSourceDirection == FlowSourceDirection.REJECT && !flowWork.hasBackRelation();
-    }
-
     /**
      * 判断当前流程是否为通过流程
      */
     public boolean isPassRecord() {
         return flowSourceDirection == FlowSourceDirection.PASS;
     }
 
-    /**
-     * 判断当前流程是否为自定义的驳回流程
-     */
-    public boolean isCustomBackRecord() {
-        return flowSourceDirection == FlowSourceDirection.REJECT && flowWork.hasBackRelation();
-    }
 
 }

springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/service/FlowNodeService.java

@@ -144,28 +144,6 @@ public void loadDefaultBackNode(FlowRecord currentRecord) {
     }
 
 
-    /**
-     * 加载自定义回退节点
-     */
-    public void loadCustomBackNode(FlowNode flowNode, long parentRecordId) {
-        FlowNode nextNode = this.matcherNextNode(flowNode, true);
-        if (nextNode == null) {
-            throw new IllegalArgumentException("next node not found");
-        }
-        IFlowOperator flowOperator = currentOperator;
-        if (nextNode.isAnyOperatorMatcher()) {
-            // 如果是任意人员操作时则需要指定为当时审批人员为当前审批人员
-            FlowRecord preFlowRecord = flowRecordRepository.getFlowRecordById(parentRecordId);
-            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;
-    }
-
 
     /**
      * 获取下一个节点

springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/service/impl/FlowSubmitService.java

@@ -191,12 +191,8 @@ private void loadNextNode(List<FlowRecord> historyRecords) {
         // 审批通过并进入下一节点
         if (flowDirectionService.isPassRecord()) {
             flowNodeService.loadNextPassNode(flowNode);
-            // 审批拒绝返回上一节点
-        } else if (flowDirectionService.isDefaultBackRecord()) {
+        } else  {
             flowNodeService.loadDefaultBackNode(flowRecord);
-        } else {
-            // 审批拒绝，并且自定了返回节点
-            flowNodeService.loadCustomBackNode(flowNode, flowRecord.getPreId());
         }
         this.nextNode = flowNodeService.getNextNode();
     }