fix #119

Author: xlorne

pom.xml

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

springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/event/FlowApprovalEvent.java

@@ -36,6 +36,8 @@ public class FlowApprovalEvent implements ISyncEvent {
     public static final int STATE_CIRCULATE = 9;
     // 保存
     public static final int STATE_SAVE = 10;
+    // 删除
+    public static final int STATE_DELETE = 11;
 
 
     private final int state;

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

@@ -41,8 +41,8 @@ public FlowService(FlowWorkRepository flowWorkRepository,
         this.flowServiceRepositoryHolder = new FlowServiceRepositoryHolder(flowWorkRepository, flowRecordRepository, flowBindDataRepository, flowOperatorRepository, flowProcessRepository, flowBackupRepository);
         this.flowDetailService = new FlowDetailService(flowWorkRepository, flowRecordRepository, flowBindDataRepository, flowOperatorRepository, flowProcessRepository);
         this.flowCustomEventService = new FlowCustomEventService(flowWorkRepository, flowRecordRepository, flowProcessRepository);
-        this.flowRecallService = new FlowRecallService(flowWorkRepository, flowRecordRepository, flowProcessRepository);
-        this.flowRemoveService = new FlowRemoveService(flowWorkRepository, flowRecordRepository, flowProcessRepository);
+        this.flowRecallService = new FlowRecallService(flowWorkRepository, flowRecordRepository, flowProcessRepository,flowBindDataRepository);
+        this.flowRemoveService = new FlowRemoveService(flowWorkRepository, flowRecordRepository, flowProcessRepository,flowBindDataRepository);
         this.flowSaveService = new FlowSaveService(flowWorkRepository, flowRecordRepository, flowBindDataRepository, flowProcessRepository);
         this.flowTransferService = new FlowTransferService(flowWorkRepository, flowRecordRepository, flowBindDataRepository, flowProcessRepository);
         this.flowPostponedService = new FlowPostponedService(flowWorkRepository, flowRecordRepository, flowProcessRepository);
@@ -57,11 +57,13 @@ public FlowService(FlowWorkRepository flowWorkRepository,
      * @return 流程详情
      */
     public FlowDetail detail(long recordId, String workCode, IFlowOperator currentOperator) {
+        if (recordId > 0) {
+            return flowDetailService.detail(recordId, currentOperator);
+        }
         if (StringUtils.hasText(workCode)) {
             return flowDetailService.detail(workCode, currentOperator);
-        } else {
-            return flowDetailService.detail(recordId, currentOperator);
         }
+        return null;
     }
 
     /**

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

@@ -1,8 +1,11 @@
 package com.codingapi.springboot.flow.service.impl;
 
+import com.codingapi.springboot.flow.bind.BindDataSnapshot;
+import com.codingapi.springboot.flow.bind.IBindData;
 import com.codingapi.springboot.flow.domain.FlowWork;
 import com.codingapi.springboot.flow.event.FlowApprovalEvent;
 import com.codingapi.springboot.flow.record.FlowRecord;
+import com.codingapi.springboot.flow.repository.FlowBindDataRepository;
 import com.codingapi.springboot.flow.repository.FlowProcessRepository;
 import com.codingapi.springboot.flow.repository.FlowRecordRepository;
 import com.codingapi.springboot.flow.repository.FlowWorkRepository;
@@ -22,6 +25,7 @@ public class FlowRecallService {
     private final FlowWorkRepository flowWorkRepository;
     private final FlowRecordRepository flowRecordRepository;
     private final FlowProcessRepository flowProcessRepository;
+    private final FlowBindDataRepository flowBindDataRepository;
 
     /**
      * 撤回流程
@@ -47,6 +51,8 @@ public void recall(long recordId, IFlowOperator currentOperator) {
 
         // 下一流程的流程记录
         List<FlowRecord> childrenRecords = flowRecordRepository.findFlowRecordByPreId(recordId);
+
+        BindDataSnapshot bindDataSnapshot = flowBindDataRepository.getBindDataSnapshotById(flowRecord.getSnapshotId());
         // 下一流程均为办理且未读
 
         // 如果是在开始节点撤销，则直接删除
@@ -71,6 +77,8 @@ public void recall(long recordId, IFlowOperator currentOperator) {
             flowRecordRepository.delete(childrenRecords);
         }
 
-        EventPusher.push(new FlowApprovalEvent(FlowApprovalEvent.STATE_RECALL, flowRecord, currentOperator, flowWork, null), true);
+        IBindData bindData =  bindDataSnapshot.toBindData();
+
+        EventPusher.push(new FlowApprovalEvent(FlowApprovalEvent.STATE_RECALL, flowRecord, currentOperator, flowWork, bindData), true);
     }
 }

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

@@ -1,9 +1,12 @@
 package com.codingapi.springboot.flow.service.impl;
 
+import com.codingapi.springboot.flow.bind.BindDataSnapshot;
+import com.codingapi.springboot.flow.bind.IBindData;
 import com.codingapi.springboot.flow.domain.FlowNode;
 import com.codingapi.springboot.flow.domain.FlowWork;
 import com.codingapi.springboot.flow.event.FlowApprovalEvent;
 import com.codingapi.springboot.flow.record.FlowRecord;
+import com.codingapi.springboot.flow.repository.FlowBindDataRepository;
 import com.codingapi.springboot.flow.repository.FlowProcessRepository;
 import com.codingapi.springboot.flow.repository.FlowRecordRepository;
 import com.codingapi.springboot.flow.repository.FlowWorkRepository;
@@ -23,7 +26,7 @@ public class FlowRemoveService {
     private final FlowWorkRepository flowWorkRepository;
     private final FlowRecordRepository flowRecordRepository;
     private final FlowProcessRepository flowProcessRepository;
-
+    private final FlowBindDataRepository flowBindDataRepository;
 
     /**
      * 删除流程
@@ -44,15 +47,20 @@ public void remove(long recordId, IFlowOperator currentOperator) {
         flowRecordVerifyService.loadFlowNode();
         flowRecordVerifyService.verifyFlowRecordNotFinish();
         flowRecordVerifyService.verifyFlowRecordIsTodo();
+        FlowWork flowWork = flowRecordVerifyService.getFlowWork();
         FlowNode flowNode =  flowRecordVerifyService.getFlowNode();
         FlowRecord flowRecord = flowRecordVerifyService.getFlowRecord();
 
         if(!flowNode.isStartNode()){
             throw new IllegalArgumentException("flow record not remove");
         }
 
-        flowProcessRepository.deleteByProcessId(flowRecord.getProcessId());
+        BindDataSnapshot bindDataSnapshot = flowBindDataRepository.getBindDataSnapshotById(flowRecord.getSnapshotId());
+        IBindData bindData =  bindDataSnapshot.toBindData();
 
+        flowProcessRepository.deleteByProcessId(flowRecord.getProcessId());
         flowRecordRepository.deleteByProcessId(flowRecord.getProcessId());
+
+        EventPusher.push(new FlowApprovalEvent(FlowApprovalEvent.STATE_DELETE, flowRecord, currentOperator, flowWork, bindData), true);
     }
 }

springboot-starter-security/pom.xml

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