fix reject back operator

Author: xlorne

pom.xml

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

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

@@ -18,6 +18,7 @@
 import lombok.Getter;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -29,6 +30,7 @@ public class FlowNodeService {
     @Getter
     private FlowNode nextNode;
     private IFlowOperator nextOperator;
+    private IFlowOperator backOperator;
 
     private final FlowOperatorRepository flowOperatorRepository;
     private final FlowRecordRepository flowRecordRepository;
@@ -116,6 +118,7 @@ public void loadDefaultBackNode(long parentRecordId) {
         }
         this.nextNode = nextNode;
         this.nextOperator = flowOperator;
+        this.backOperator = flowOperator;
     }
 
 
@@ -138,6 +141,7 @@ public void loadCustomBackNode(FlowNode flowNode, long parentRecordId) {
         }
         this.nextNode = nextNode;
         this.nextOperator = flowOperator;
+        this.backOperator = flowOperator;
     }
 
 
@@ -239,10 +243,16 @@ private List<FlowRecord> createNextRecord() {
                 historyRecords);
 
         long workId = flowWork.getId();
-        List<? extends IFlowOperator> operators = nextNode.loadFlowNodeOperator(flowSession, flowOperatorRepository);
+        List<? extends IFlowOperator> operators = null;
+        if (this.backOperator == null) {
+            operators = nextNode.loadFlowNodeOperator(flowSession, flowOperatorRepository);
+        } else {
+            operators = Collections.singletonList(this.backOperator);
+        }
         List<Long> customOperatorIds = opinion.getOperatorIds();
         if (customOperatorIds != null && !customOperatorIds.isEmpty()) {
-            operators = operators.stream().filter(operator -> customOperatorIds.contains(operator.getUserId())).collect(Collectors.toList());
+            operators = operators.stream()
+                    .filter(operator -> customOperatorIds.contains(operator.getUserId())).collect(Collectors.toList());
             if (operators.size() != customOperatorIds.size()) {
                 throw new IllegalArgumentException("operator not match.");
             }

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

@@ -124,6 +124,113 @@ void unSignTest(){
     }
 
 
+    /**
+     * 多人非会签拒绝测试
+     */
+    @Test
+    void unSignRejectTest(){
+        PageRequest pageRequest = PageRequest.of(0, 1000);
+
+        User caocao = new User("曹操");
+        userRepository.save(caocao);
+        User lvBu = new User("吕布");
+        userRepository.save(lvBu);
+        User zhaoYun = new User("赵云");
+        userRepository.save(zhaoYun);
+
+        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("请假流程")
+                .nodes()
+                .node("开始节点", "start", "default", ApprovalType.UN_SIGN, OperatorMatcher.anyOperatorMatcher())
+                .node("部门领导审批", "dept", "default", ApprovalType.UN_SIGN,
+                        OperatorMatcher.specifyOperatorMatcher(dept.getUserId(),caocao.getUserId(),lvBu.getUserId(),zhaoYun.getUserId()))
+                .node("总经理审批", "manager", "default", ApprovalType.UN_SIGN, OperatorMatcher.specifyOperatorMatcher(boss.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);
+        flowService.submitFlow(userTodo.getId(), user, leave, Opinion.pass("同意").specify(lvBu.getUserId()));
+
+        // 查看部门经理的待办
+        List<FlowRecord> deptTodos = flowRecordRepository.findTodoByOperatorId(dept.getUserId(), pageRequest).getContent();
+        assertEquals(0, deptTodos.size());
+
+        // 查看部门刘备经理的待办
+        List<FlowRecord> lvBuTodos = flowRecordRepository.findTodoByOperatorId(lvBu.getUserId(), pageRequest).getContent();
+        assertEquals(1, lvBuTodos.size());
+
+        // 提交部门经理的审批
+        FlowRecord lvBuTodo = lvBuTodos.get(0);
+        flowService.submitFlow(lvBuTodo.getId(), lvBu, leave, Opinion.pass("同意"));
+
+        // 查看总经理的待办
+        List<FlowRecord> bossTodos = flowRecordRepository.findTodoByOperatorId(boss.getUserId(), pageRequest).getContent();
+        assertEquals(1, bossTodos.size());
+
+        // 提交总经理的审批
+        FlowRecord bossTodo = bossTodos.get(0);
+        flowService.submitFlow(bossTodo.getId(), boss, leave, Opinion.reject("不同意"));
+
+        // 查看所有流程
+        List<FlowRecord> records = flowRecordRepository.findAll(pageRequest).getContent();;
+        assertEquals(4, records.size());
+
+        lvBuTodos = flowRecordRepository.findTodoByOperatorId(lvBu.getUserId(), pageRequest).getContent();
+        assertEquals(1, lvBuTodos.size());
+
+        // 提交部门经理的审批
+        lvBuTodo = lvBuTodos.get(0);
+        flowService.submitFlow(lvBuTodo.getId(), lvBu, leave, Opinion.pass("同意"));
+
+
+        bossTodos = flowRecordRepository.findTodoByOperatorId(boss.getUserId(), pageRequest).getContent();
+        assertEquals(1, bossTodos.size());
+
+        // 提交总经理的审批
+        bossTodo = bossTodos.get(0);
+        flowService.submitFlow(bossTodo.getId(), boss, leave, Opinion.pass("行吧"));
+
+        userTodos = flowRecordRepository.findTodoByOperatorId(user.getUserId(), pageRequest).getContent();
+        assertEquals(0, userTodos.size());
+
+        records = flowRecordRepository.findAll(pageRequest).getContent();
+        assertEquals(5, records.size());
+        // 查看所有流程是否都已经结束
+        assertTrue(records.stream().allMatch(FlowRecord::isFinish));
+
+        List<BindDataSnapshot> snapshots = flowBindDataRepository.findAll();
+        assertEquals(6, snapshots.size());
+
+    }
+
 
     /**
      * 多人会签测试
@@ -495,35 +602,6 @@ void signTrySubmitTest(){
         List<FlowRecord> bossTodos = flowRecordRepository.findTodoByOperatorId(boss.getUserId(), pageRequest).getContent();
         assertEquals(1, bossTodos.size());
 
-//        // 查看部门经理 吕布 的待办
-//        List<FlowRecord> lvbuTodos = flowRecordRepository.findTodoByOperatorId(lvBu.getUserId(), pageRequest).getContent();
-//        assertEquals(1, lvbuTodos.size());
-//
-//        // 提交部门经理 吕布 的审批
-//        FlowRecord lvbuTodo = lvbuTodos.get(0);
-//        flowService.submitFlow(lvbuTodo.getId(), lvBu, leave, Opinion.pass("吕布同意"));
-//
-//
-//        // 查看部门经理 赵云 的待办
-//        List<FlowRecord> zhaoYunTodos = flowRecordRepository.findTodoByOperatorId(zhaoYun.getUserId(), pageRequest).getContent();
-//        assertEquals(1, zhaoYunTodos.size());
-//
-//        // 提交部门经理 赵云 的审批
-//        FlowRecord zhaoYunTodo = zhaoYunTodos.get(0);
-//        flowService.submitFlow(zhaoYunTodo.getId(), zhaoYun, leave, Opinion.pass("赵云同意"));
-//
-//
-//        // 查看部门经理 曹操 的待办
-//        List<FlowRecord> caocaoTodos = flowRecordRepository.findTodoByOperatorId(caocao.getUserId(), pageRequest).getContent();
-//        assertEquals(1, caocaoTodos.size());
-//
-//        // 提交部门经理 曹操 的审批
-//        FlowRecord caocaoTodo = caocaoTodos.get(0);
-//        flowService.submitFlow(caocaoTodo.getId(), caocao, leave, Opinion.pass("曹操同意"));
-//
-//        bossTodos = flowRecordRepository.findTodoByOperatorId(boss.getUserId(), pageRequest).getContent();
-//        assertEquals(1, bossTodos.size());
-
         // 提交总经理的审批
         FlowRecord bossTodo = bossTodos.get(0);
         flowService.submitFlow(bossTodo.getId(), boss, leave, Opinion.pass("同意"));

springboot-starter-security/pom.xml

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

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

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