From 327efce893aebf9f0a5787052070708489a99291 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Wed, 24 Jan 2024 16:27:01 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A4=8D=E5=AE=A1=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E5=90=8E=E7=AB=AF=E6=8E=A7=E5=88=B6=E8=8A=82=E7=82=B9=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../activiti/service/ProcessNodeService.java  | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessNodeService.java b/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessNodeService.java
index 69655f72..e7b33356 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessNodeService.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessNodeService.java
@@ -132,7 +132,7 @@ public class ProcessNodeService extends ServiceImpl<ProcessNodeMapper, ProcessNo
         }
         // 启用封存废止流程特殊后处理
         if (processDefinitionId.contains(ProcessType.ES_ENABLE.getProcessKey()) ||
-                processDefinitionId.contains(ProcessType.ES_ARCHIVE.getProcessKey())||
+                processDefinitionId.contains(ProcessType.ES_ARCHIVE.getProcessKey()) ||
                 processDefinitionId.contains(ProcessType.ES_ABOLISH.getProcessKey())) {
             specialProcessEsMiniProcessEnd(processNodeList);
         }
@@ -140,9 +140,24 @@ public class ProcessNodeService extends ServiceImpl<ProcessNodeMapper, ProcessNo
         if (processDefinitionId.contains(ProcessType.ES_INIT_CHANGE.getProcessKey())) {
             specialProcessEsInitChange(processNodeList, processInstanceId);
         }
+        // 复审流程特殊后处理
+        if (processDefinitionId.contains(ProcessType.ES_RECHECK.getProcessKey())) {
+            specialProcessEsRecheck(processNodeList, processInstanceId);
+        }
         return processNodeList;
     }
 
+    private void specialProcessEsRecheck(List<ProcessNode> processNodeList, String processInstanceId) {
+        // 如果有标准化发起节点，但是没有人员，则删除标准化发起节点
+        ProcessNode firstNode = processNodeList.get(0);
+        ProcessNode secondNode = processNodeList.get(1);
+        if (StrUtil.isNotBlank(secondNode.getLinkUserIds())) {
+            if (StrUtil.isBlank(firstNode.getLinkUserIds())) {
+                processNodeList.remove(0);
+            }
+        }
+    }
+
     private void specialProcessEsInitChange(List<ProcessNode> processNodeList, String processInstanceId) {
         LambdaQueryWrapper<ProcessEsInitChange> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(ProcessEsInitChange::getProcessInstanceId, processInstanceId);
@@ -193,6 +208,7 @@ public class ProcessNodeService extends ServiceImpl<ProcessNodeMapper, ProcessNo
 
     /**
      * 前处理
+     *
      * @param processNodeList
      */
     private void specialProcessEsRevisionPre(List<ProcessNode> processNodeList) {
@@ -217,6 +233,7 @@ public class ProcessNodeService extends ServiceImpl<ProcessNodeMapper, ProcessNo
 
     /**
      * 后处理
+     *
      * @param processNodeList
      */
     private void specialProcessEsRevisionEnd(List<ProcessNode> processNodeList) {