From 4cdf227c461d627a7b2f9a17c8f24ce072a520c6 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Wed, 17 Jan 2024 11:13:12 +0800
Subject: [PATCH] =?UTF-8?q?fix:=2080096=20=E4=BC=81=E6=A0=87=E5=BA=9F?=
 =?UTF-8?q?=E6=AD=A2/=E5=B0=81=E5=AD=98/=E5=90=AF=E7=94=A8=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B--=E8=B7=B3=E8=BF=87=E7=9A=84=E8=8A=82=E7=82=B9?=
 =?UTF-8?q?=E5=9C=A8=E6=9F=A5=E7=9C=8B=E9=A1=B5=E9=9D=A2=E9=9C=80=E8=A6=81?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=90=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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 a52f7b57..2d481e09 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
@@ -124,9 +124,28 @@ public class ProcessNodeService extends ServiceImpl<ProcessNodeMapper, ProcessNo
         if (processDefinitionId.contains(ProcessType.ES_REVISION.getProcessKey())) {
             specialProcessEsRevisionEnd(processNodeList);
         }
+        // 启用封存废止流程特殊后处理
+        if (processDefinitionId.contains(ProcessType.ES_ENABLE.getProcessKey()) ||
+                processDefinitionId.contains(ProcessType.ES_ARCHIVE.getProcessKey())||
+                processDefinitionId.contains(ProcessType.ES_ABOLISH.getProcessKey())) {
+            specialProcessEsMiniProcessEnd(processNodeList);
+        }
         return processNodeList;
     }
 
+    private void specialProcessEsMiniProcessEnd(List<ProcessNode> processNodeList) {
+        // 如果第三个节点有选人信息，则判断相关人员会签节点是否有人，如果没人，则删除相关人员会签节点
+        if (processNodeList.size() >= 3) {
+            ProcessNode processNode = processNodeList.get(2);
+            if (StrUtil.isNotBlank(processNode.getLinkUserIds())) {
+                ProcessNode processNode1 = processNodeList.get(1);
+                if (StrUtil.isBlank(processNode1.getLinkUserIds())) {
+                    processNodeList.remove(1);
+                }
+            }
+        }
+    }
+
     /**
      * 前处理
      * @param processNodeList