update 2.9.24

Author: xlorne

pom.xml

@@ -15,7 +15,7 @@
 
     <groupId>com.codingapi.springboot</groupId>
     <artifactId>springboot-parent</artifactId>
-    <version>2.9.23</version>
+    <version>2.9.24</version>
 
     <url>https://github.com/codingapi/springboot-framewrok</url>
     <name>springboot-parent</name>

springboot-starter-data-authorization/pom.xml

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

springboot-starter-data-fast/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>2.9.23</version>
+        <version>2.9.24</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>2.9.23</version>
+        <version>2.9.24</version>
     </parent>
 
     <name>springboot-starter-flow</name>

springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/pojo/FlowResult.java

@@ -35,4 +35,10 @@ public FlowResult(FlowWork flowWork,FlowRecord flowRecord) {
     public List<FlowRecord> matchRecordByOperator(IFlowOperator operator){
         return records.stream().filter(record -> record.isOperator(operator)).collect(Collectors.toList());
     }
+
+
+    public boolean isOver() {
+        return records.stream().allMatch(FlowRecord::isOverNode);
+    }
+
 }

springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/record/FlowRecord.java

@@ -432,4 +432,8 @@ public boolean isPostponed() {
     public boolean isStartRecord() {
         return this.preId == 0;
     }
+
+    public boolean isOverNode() {
+        return this.nodeCode.equals(FlowNode.CODE_OVER);
+    }
 }

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

@@ -231,13 +231,13 @@ private void pushEvent(FlowRecord flowRecord, int eventState) {
      */
     public FlowResult submitFlow() {
         FlowResult flowResult = this.submitCurrentFlow();
-        if (this.isSkipIfSameApprover()) {
+        if (this.isSkipIfSameApprover() && !flowResult.isOver()) {
             List<FlowRecord> flowRecords = flowResult.matchRecordByOperator(currentOperator);
             FlowResult result = flowResult;
             if (!flowRecords.isEmpty()) {
                 for (FlowRecord flowRecord : flowRecords) {
                     FlowSubmitService flowSubmitService = new FlowSubmitService(flowRecord.getId(), currentOperator, bindData, opinion, flowServiceRepositoryHolder);
-                    result = flowSubmitService.submitCurrentFlow();
+                    result = flowSubmitService.submitFlow();
                 }
             }
             return result;

springboot-starter-security/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>2.9.23</version>
+        <version>2.9.24</version>
     </parent>
 
     <artifactId>springboot-starter-security</artifactId>

springboot-starter/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>2.9.23</version>
+        <version>2.9.24</version>
     </parent>
     <artifactId>springboot-starter</artifactId>
 

springboot-starter/src/main/resources/META-INF/banner.txt

@@ -1,4 +1,4 @@
 ------------------------------------------------------
-CodingApi SpringBoot-Starter 2.9.23
+CodingApi SpringBoot-Starter 2.9.24
 springboot version (${spring-boot.version})
 ------------------------------------------------------