Merge pull request #118 from codingapi/dev

xlorne · web-flow · commit 8624a280374d · 2025-06-30T11:56:07.000+08:00
Dev
diff --git a/example/example-app/example-app-cmd-domain/pom.xml b/example/example-app/example-app-cmd-domain/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>example-app</artifactId>
-        <version>3.4.4</version>
+        <version>3.4.6</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/example/example-app/example-app-cmd-meta/pom.xml b/example/example-app/example-app-cmd-meta/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>example-app</artifactId>
-        <version>3.4.4</version>
+        <version>3.4.6</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/example/example-app/example-app-query/pom.xml b/example/example-app/example-app-query/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>example-app</artifactId>
-        <version>3.4.4</version>
+        <version>3.4.6</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/example/example-app/pom.xml b/example/example-app/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>springboot-example</artifactId>
-        <version>3.4.4</version>
+        <version>3.4.6</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>pom</packaging>
diff --git a/example/example-domain/example-domain-leave/pom.xml b/example/example-domain/example-domain-leave/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>example-domain</artifactId>
-        <version>3.4.4</version>
+        <version>3.4.6</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/example/example-domain/example-domain-user/pom.xml b/example/example-domain/example-domain-user/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>example-domain</artifactId>
-        <version>3.4.4</version>
+        <version>3.4.6</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/example/example-domain/pom.xml b/example/example-domain/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>springboot-example</artifactId>
-       <version>3.4.4</version>
+       <version>3.4.6</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/example/example-infra/example-infra-flow/pom.xml b/example/example-infra/example-infra-flow/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>example-infra</artifactId>
-       <version>3.4.4</version>
+       <version>3.4.6</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/example/example-infra/example-infra-jpa/pom.xml b/example/example-infra/example-infra-jpa/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>example-infra</artifactId>
-        <version>3.4.4</version>
+        <version>3.4.6</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/example/example-infra/example-infra-security/pom.xml b/example/example-infra/example-infra-security/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>example-infra</artifactId>
-        <version>3.4.4</version>
+        <version>3.4.6</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/example/example-infra/pom.xml b/example/example-infra/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>springboot-example</artifactId>
-        <version>3.4.4</version>
+        <version>3.4.6</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>pom</packaging>
diff --git a/example/example-interface/pom.xml b/example/example-interface/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>springboot-example</artifactId>
-        <version>3.4.4</version>
+        <version>3.4.6</version>
     </parent>
 
     <artifactId>example-interface</artifactId>
diff --git a/example/example-server/pom.xml b/example/example-server/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-       <version>3.4.4</version>
+       <version>3.4.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/example/pom.xml b/example/pom.xml
@@ -19,7 +19,7 @@
     </parent>
 
     <artifactId>springboot-example</artifactId>
-    <version>3.4.4</version>
+    <version>3.4.6</version>
 
     <name>springboot-example</name>
     <description>springboot-example project for Spring Boot</description>
diff --git a/pom.xml b/pom.xml
@@ -12,7 +12,7 @@
 
     <groupId>com.codingapi.springboot</groupId>
     <artifactId>springboot-parent</artifactId>
-    <version>3.4.4</version>
+    <version>3.4.6</version>
 
     <url>https://github.com/codingapi/springboot-framewrok</url>
     <name>springboot-parent</name>
diff --git a/springboot-starter-data-authorization/pom.xml b/springboot-starter-data-authorization/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>springboot-parent</artifactId>
-       <version>3.4.4</version>
+       <version>3.4.6</version>
     </parent>
 
     <artifactId>springboot-starter-data-authorization</artifactId>
diff --git a/springboot-starter-data-fast/pom.xml b/springboot-starter-data-fast/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-       <version>3.4.4</version>
+       <version>3.4.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/springboot-starter-flow/pom.xml b/springboot-starter-flow/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-       <version>3.4.4</version>
+       <version>3.4.6</version>
     </parent>
 
     <name>springboot-starter-flow</name>
diff --git a/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/domain/FlowRelation.java b/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/domain/FlowRelation.java
@@ -17,6 +17,8 @@
 @AllArgsConstructor
 public class FlowRelation {
 
+    public static final int DEFAULT_ORDER = -100;
+
     /**
      * 关系id
      */
@@ -38,7 +40,7 @@ public class FlowRelation {
     private FlowNode target;
 
     /**
-     * 排序
+     * 排序 （顺序越大的排序越靠前）
      */
     private int order;
 
@@ -145,12 +147,12 @@ public void verify() {
             throw new RuntimeException("outTrigger is null");
         }
 
-        if(source.getCode().equals(target.getCode())){
+        if (source.getCode().equals(target.getCode())) {
             throw new RuntimeException("source node code is equals target node code");
         }
 
-        if(back){
-            if(source.getType() != NodeType.APPROVAL){
+        if (back) {
+            if (source.getType() != NodeType.APPROVAL) {
                 throw new RuntimeException("source node type is not approval");
             }
         }
diff --git a/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/service/FlowNodeService.java b/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/service/FlowNodeService.java
@@ -13,6 +13,7 @@
 import com.codingapi.springboot.flow.record.FlowRecord;
 import com.codingapi.springboot.flow.repository.FlowOperatorRepository;
 import com.codingapi.springboot.flow.repository.FlowRecordRepository;
+import com.codingapi.springboot.flow.trigger.OutTrigger;
 import com.codingapi.springboot.flow.user.IFlowOperator;
 import com.codingapi.springboot.framework.event.EventPusher;
 import lombok.Getter;
@@ -113,7 +114,7 @@ public void loadDefaultBackNode(FlowRecord currentRecord) {
                 throw new IllegalArgumentException("back node not found");
             }
             FlowRecord record = historyRecords.get(index);
-            if (record.isDone()) {
+            if (record.isDone() && record.getId()== currentRecord.getPreId()) {
                 // 是连续的回退节点时，则根据流程记录的状态来判断
                 if(record.isReject()){
                     boolean startRemove = false;
@@ -172,7 +173,28 @@ public void loadCustomBackNode(FlowNode flowNode, long parentRecordId) {
      * @return 下一个节点
      */
     private FlowNode matcherNextNode(FlowNode flowNode, boolean back) {
-        List<FlowRelation> relations = flowWork.getRelations().stream()
+        List<FlowRelation> currentRelations = new ArrayList<>(flowWork.getRelations());
+        if(back){
+            String preCode = FlowNode.CODE_START;
+            if(flowRecord.getPreId()!=0){
+                FlowRecord preRecord = flowRecordRepository.getFlowRecordById(flowRecord.getPreId());
+                if(preRecord!=null){
+                    preCode = preRecord.getNodeCode();
+                    while (preCode.equals(flowRecord.getNodeCode())){
+                        preRecord = flowRecordRepository.getFlowRecordById(preRecord.getPreId());
+                        if(preRecord==null){
+                            break;
+                        }
+                        preCode = preRecord.getNodeCode();
+                    }
+                }
+            }
+            FlowRelation backRelation = new FlowRelation("defaultId",
+                    "默认回退关系", flowNode, flowWork.getNodeByCode(preCode), OutTrigger.defaultOutTrigger(), FlowRelation.DEFAULT_ORDER, true);
+            currentRelations.add(backRelation);
+        }
+
+        List<FlowRelation> relations = currentRelations.stream()
                 .filter(relation -> relation.sourceMatcher(flowNode.getCode()))
                 .filter(relation -> relation.isBack() == back)
                 .sorted((o1, o2) -> (o2.getOrder() - o1.getOrder()))
@@ -313,7 +335,7 @@ private List<FlowRecord> errMatcher(FlowNode currentNode, IFlowOperator currentO
                 List<Long> operatorIds = ((OperatorResult) errorResult).getOperatorIds();
                 List<? extends IFlowOperator> operators = flowOperatorRepository.findByIds(operatorIds);
                 for (IFlowOperator operator : operators) {
-                    FlowSession content = new FlowSession(flowRecord, flowWork, currentNode, createOperator, operator, snapshot.toBindData(), opinion, historyRecords);
+                    FlowSession content = new FlowSession(flowRecord, flowWork, currentNode, createOperator, nextOperator, snapshot.toBindData(), opinion, historyRecords);
                     String recordTitle = currentNode.generateTitle(content);
                     FlowRecord record = currentNode.createRecord(flowWork.getId(), flowWork.getCode(), processId, preId, recordTitle, createOperator, operator, snapshot, opinion.isWaiting());
                     recordList.add(record);
diff --git a/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/service/impl/FlowSubmitService.java b/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/service/impl/FlowSubmitService.java
@@ -281,7 +281,7 @@ private FlowResult submitCurrentFlow() {
         if (flowNode.isUnSign()) {
             for (FlowRecord record : historyRecords) {
                 if (record.isTodo() && record.getId() != flowRecord.getId()) {
-                    record.autoPass(currentOperator, snapshot);
+                    record.autoPass(record.getCurrentOperator(), snapshot);
                     FlowRecordRepository flowRecordRepository = flowServiceRepositoryHolder.getFlowRecordRepository();
                     flowRecordRepository.update(record);
                 }
diff --git a/springboot-starter-flow/src/test/java/com/codingapi/springboot/flow/test/ErrorTest.java b/springboot-starter-flow/src/test/java/com/codingapi/springboot/flow/test/ErrorTest.java
@@ -209,4 +209,84 @@ void errorMatcherNodeTest(){
         List<BindDataSnapshot> snapshots = flowBindDataRepository.findAll();
         assertEquals(3, snapshots.size());
     }
+
+
+    /**
+     * 相同人审批通过，指定人员审批时遇到异常，走异常节点配置
+     */
+    @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(user.getUserId()))
+                .node("总经理审批", "manager", "default", ApprovalType.UN_SIGN, OperatorMatcher.specifyOperatorMatcher(dept.getUserId()), new ErrTrigger("" +
+                        "def run(content){" +
+                        "    return content.createOperatorErrTrigger(" + dept.getUserId() + ")" +
+                        "}"+
+                        ""),true, false)
+                .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("同意").specify(user.getUserId()));
+
+        // 查看刘备经理的待办
+        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());
+
+    }
 }
diff --git a/springboot-starter-flow/src/test/java/com/codingapi/springboot/flow/test/FlowTest.java b/springboot-starter-flow/src/test/java/com/codingapi/springboot/flow/test/FlowTest.java
diff --git a/springboot-starter-security/pom.xml b/springboot-starter-security/pom.xml
diff --git a/springboot-starter/pom.xml b/springboot-starter/pom.xml
diff --git a/springboot-starter/src/main/java/com/codingapi/springboot/framework/annotation/ColumnType.java b/springboot-starter/src/main/java/com/codingapi/springboot/framework/annotation/ColumnType.java
diff --git a/springboot-starter/src/main/java/com/codingapi/springboot/framework/event/SpringEventHandler.java b/springboot-starter/src/main/java/com/codingapi/springboot/framework/event/SpringEventHandler.java
diff --git a/springboot-starter/src/main/resources/banner.txt b/springboot-starter/src/main/resources/banner.txt
diff --git a/springboot-starter/src/test/java/com/codingapi/springboot/framework/event/EventPusherTest.java b/springboot-starter/src/test/java/com/codingapi/springboot/framework/event/EventPusherTest.java

Original file line number	Diff line number	Diff line change
`@@ -281,7 +281,7 @@ private FlowResult submitCurrentFlow() {`
`281`	`281`	`if (flowNode.isUnSign()) {`
`282`	`282`	`for (FlowRecord record : historyRecords) {`
`283`	`283`	`if (record.isTodo() && record.getId() != flowRecord.getId()) {`
`284`		`- record.autoPass(currentOperator, snapshot);`
	`284`	`+ record.autoPass(record.getCurrentOperator(), snapshot);`
`285`	`285`	`FlowRecordRepository flowRecordRepository = flowServiceRepositoryHolder.getFlowRecordRepository();`
`286`	`286`	`flowRecordRepository.update(record);`
`287`	`287`	`}`