fix #165

Author: xlorne

pom.xml

@@ -15,7 +15,7 @@
 
     <groupId>com.codingapi.springboot</groupId>
     <artifactId>springboot-parent</artifactId>
-    <version>2.10.22</version>
+    <version>2.10.23</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.10.22</version>
+        <version>2.10.23</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>2.10.22</version>
+        <version>2.10.23</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.10.22</version>
+        <version>2.10.23</version>
     </parent>
 
     <name>springboot-starter-flow</name>

springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/content/FlowSession.java

@@ -283,6 +283,19 @@ public void recallFlow() {
     }
 
 
+    /**
+     * 撤回流程
+     * @param backStartNode  是否退回到发起节点（仅限于流程创建者有效）
+     */
+    public void recallFlow(boolean backStartNode) {
+        if (flowRecord == null) {
+            throw new IllegalArgumentException("flow record is null");
+        }
+        FlowService flowService = loadFlowService();
+        flowService.recall(flowRecord.getId(), currentOperator, backStartNode);
+    }
+
+
     private FlowService loadFlowService() {
         return (FlowService) getBean("flowService");
     }

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

@@ -281,6 +281,17 @@ public void recall(long recordId, IFlowOperator currentOperator) {
         flowRecallService.recall(recordId, currentOperator);
     }
 
+    /**
+     * 撤回流程
+     *
+     * @param recordId        流程记录id
+     * @param currentOperator 当前操作者
+     * @param backStartNode  是否退回到发起节点（仅限于流程创建者有效）
+    */
+    public void recall(long recordId, IFlowOperator currentOperator, boolean backStartNode) {
+        flowRecallService.recall(recordId, currentOperator,backStartNode);
+    }
+
 
     /**
      * 删除流程

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

@@ -32,8 +32,9 @@ public class FlowRecallService {
      *
      * @param recordId        流程记录id
      * @param currentOperator 当前操作者
+     * @param backStartNode  是否退回到发起节点（仅限于流程创建者有效）
      */
-    public void recall(long recordId, IFlowOperator currentOperator) {
+    public void recall(long recordId, IFlowOperator currentOperator,boolean backStartNode) {
         FlowRecordVerifyService flowRecordVerifyService = new FlowRecordVerifyService(
                 flowWorkRepository,
                 flowRecordRepository,
@@ -51,7 +52,7 @@ public void recall(long recordId, IFlowOperator currentOperator) {
         FlowWork flowWork = flowRecordVerifyService.getFlowWork();
         BindDataSnapshot bindDataSnapshot = flowBindDataRepository.getBindDataSnapshotById(flowRecord.getSnapshotId());
 
-        if(flowRecordVerifyService.isCreateOperator()){
+        if(backStartNode && flowRecordVerifyService.isCreateOperator()){
             List<FlowRecord> records = flowRecordRepository.findFlowRecordByProcessId(flowRecord.getProcessId());
             for(FlowRecord record:records){
                 if(!record.isStartRecord()) {
@@ -88,4 +89,15 @@ public void recall(long recordId, IFlowOperator currentOperator) {
         IBindData bindData = bindDataSnapshot.toBindData();
         EventPusher.push(new FlowApprovalEvent(FlowApprovalEvent.STATE_RECALL, flowRecord, currentOperator, flowWork, bindData), true);
     }
+
+
+    /**
+     * 撤回流程
+     *
+     * @param recordId        流程记录id
+     * @param currentOperator 当前操作者
+     */
+    public void recall(long recordId, IFlowOperator currentOperator) {
+        this.recall(recordId, currentOperator, true);
+    }
 }

springboot-starter-security/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>2.10.22</version>
+        <version>2.10.23</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.10.22</version>
+        <version>2.10.23</version>
     </parent>
     <artifactId>springboot-starter</artifactId>