fix trySubmit

Author: xlorne

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

@@ -2,6 +2,7 @@
 
 import com.codingapi.springboot.flow.domain.FlowWork;
 import com.codingapi.springboot.flow.record.FlowRecord;
+import com.codingapi.springboot.flow.user.IFlowOperator;
 import lombok.Getter;
 
 import java.util.ArrayList;
@@ -23,4 +24,14 @@ public FlowResult(FlowWork flowWork,FlowRecord flowRecord) {
         this.records = new ArrayList<>();
         this.records.add(flowRecord);
     }
+
+    /**
+     * 匹配操作者的记录
+     * @param operator 操作者
+     * @return 记录
+     */
+    public List<FlowRecord> matchRecordByOperator(IFlowOperator operator){
+        return records.stream().filter(record -> record.isOperator(operator)).toList();
+    }
+
 }

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

@@ -218,7 +218,33 @@ private void pushEvent(FlowRecord flowRecord, int eventState) {
         ), true);
     }
 
+
+    /**
+     * 提交流程 根据流程的是否跳过相同审批人来判断是否需要继续提交
+     * @return 流程结果
+     */
     public FlowResult submitFlow() {
+        FlowResult flowResult = this.submitCurrentFlow();
+        if (this.isSkipIfSameApprover()) {
+            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();
+                }
+            }
+            return result;
+        } else {
+            return flowResult;
+        }
+    }
+
+    /**
+     * 提交当前流程
+     * @return 流程结果
+     */
+    private FlowResult submitCurrentFlow() {
         // 加载流程信息
         this.loadFlow(false);
 
@@ -340,4 +366,10 @@ public FlowSubmitResult trySubmitFlow() {
         List<? extends IFlowOperator> operators = flowNodeService.loadNextNodeOperators();
         return new FlowSubmitResult(flowWork, nextNode, operators);
     }
+
+
+    // 是否跳过相同审批人
+    public boolean isSkipIfSameApprover() {
+        return flowWork.isSkipIfSameApprover();
+    }
 }

springboot-starter-flow/src/test/java/com/codingapi/springboot/flow/test/FlowTest.java

@@ -131,6 +131,84 @@ void entrustTest() {
 
 
 
+    /**
+     * 自己审批时直接通过
+     */
+    @Test
+    void sameUserFlow() {
+        PageRequest pageRequest = PageRequest.of(0, 1000);
+
+        User user = new User("张飞");
+        userRepository.save(user);
+
+        User dept = new User("刘备");
+        userRepository.save(dept);
+
+        User boss = new User("诸葛亮");
+        userRepository.save(boss);
+
+        FlowWork flowWork = FlowWorkBuilder.builder(user)
+                .title("请假流程")
+                .skipIfSameApprover(true)
+                .nodes()
+                .node("开始节点", "start", "default", ApprovalType.UN_SIGN, OperatorMatcher.anyOperatorMatcher())
+                .node("部门领导审批", "dept", "default", ApprovalType.UN_SIGN, OperatorMatcher.specifyOperatorMatcher(dept.getUserId()))
+                .node("总经理审批", "manager", "default", ApprovalType.UN_SIGN, OperatorMatcher.specifyOperatorMatcher(dept.getUserId()))
+                .node("结束节点", "over", "default", ApprovalType.UN_SIGN, OperatorMatcher.anyOperatorMatcher())
+                .relations()
+                .relation("部门领导审批", "start", "dept")
+                .relation("总经理审批", "dept", "manager")
+                .relation("结束节点", "manager", "over")
+                .build();
+
+        flowWorkRepository.save(flowWork);
+
+        String workCode = flowWork.getCode();
+
+        Leave leave = new Leave("我要出去看看");
+        leaveRepository.save(leave);
+
+        // 创建流程
+        flowService.startFlow(workCode, user, leave, "发起流程");
+
+        // 查看我的待办
+        List<FlowRecord> userTodos = flowRecordRepository.findTodoByOperatorId(user.getUserId(), pageRequest).getContent();
+        assertEquals(1, userTodos.size());
+
+        // 提交流程
+        FlowRecord userTodo = userTodos.get(0);
+        assertEquals(0, userTodo.getTimeoutTime());
+
+        flowService.submitFlow(userTodo.getId(), user, leave, Opinion.pass("同意"));
+
+        // 查看刘备经理的待办
+        List<FlowRecord> deptTodos = flowRecordRepository.findTodoByOperatorId(dept.getUserId(), pageRequest).getContent();
+        assertEquals(1, deptTodos.size());
+
+        // 提交委托dept部门经理的审批
+        FlowRecord deptTodo = deptTodos.get(0);
+        flowService.submitFlow(deptTodo.getId(), dept, leave, Opinion.pass("同意"));
+
+        // 查看所有流程
+        List<FlowRecord> records = flowRecordRepository.findAll(pageRequest).getContent();
+        assertEquals(3, records.size());
+
+        userTodos = flowRecordRepository.findTodoByOperatorId(user.getUserId(), pageRequest).getContent();
+        assertEquals(0, userTodos.size());
+
+        records = flowRecordRepository.findAll(pageRequest).getContent();
+        assertEquals(3, records.size());
+        // 查看所有流程是否都已经结束
+        assertTrue(records.stream().allMatch(FlowRecord::isFinish));
+
+        List<BindDataSnapshot> snapshots = flowBindDataRepository.findAll();
+        assertEquals(4, snapshots.size());
+
+    }
+
+
+
+
     /**
      * 同意再拒绝
      */