From 128fd7b2cfc904e5191cb5fe544c0926621712e2 Mon Sep 17 00:00:00 2001
From: yjz <3131811435@qq.com>
Date: Tue, 23 Jan 2024 16:42:57 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=A0=87=E5=87=86=E5=BE=81=E6=B1=82?=
 =?UTF-8?q?=E6=84=8F=E8=A7=81=E6=B5=81=E7=A8=8B):=2081109?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...ocessFbStandardConsultationServiceImpl.java | 18 ++++++++++++++++--
 .../service/impl/ProcessHandleServiceImpl.java | 13 +++++++++++++
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationServiceImpl.java
index eb848c77..798b8439 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationServiceImpl.java
@@ -1012,7 +1012,6 @@ public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl<Proces
         ProcessNode processNode = processNodeService.getOne(queryWrapper, false);
 
         ProcessNode processNode2 = new ProcessNode();
-        ProcessNode processNode3 = new ProcessNode();
         if (Objects.equals(sort, ConsultationNodeSort.MODULE_OWNER_LIST)){
             LambdaQueryWrapper<ProcessNode> qw = new LambdaQueryWrapper<>();
             qw.eq(ProcessNode::getProcessDefinitionId, processDefinitionId);
@@ -1025,7 +1024,22 @@ public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl<Proces
             qw2.eq(ProcessNode::getProcessDefinitionId, processDefinitionId);
             qw2.eq(ProcessNode::getIsView, 1);
             qw2.eq(ProcessNode::getXmlNodeId, ConsultationTaskKey.DEPART_LEADER_END_4);
-            processNode3 = processNodeService.getOne(qw2, false);
+            ProcessNode processNode3 = processNodeService.getOne(qw2, false);
+            ProcessNodeLink link = new ProcessNodeLink();
+            link.setProcessDefinitionId(processDefinitionId);
+            link.setProcessNodeId(processNode3.getId());
+            link.setProcessInstanceId(processInstanceId);
+            link.setUserId(CurrentUserUtil.getId());
+            processNodeLinkService.save(link);
+        }
+
+        if (Objects.equals(sort, ConsultationNodeSort.DESIGN_ENGINEER_LIST)){
+            // 各部所主管级领导汇总
+            LambdaQueryWrapper<ProcessNode> qw = new LambdaQueryWrapper<>();
+            qw.eq(ProcessNode::getProcessDefinitionId, processDefinitionId);
+            qw.eq(ProcessNode::getIsView, 1);
+            qw.eq(ProcessNode::getXmlNodeId, ConsultationTaskKey.DEPART_LEADER_COLLECT_3);
+            ProcessNode processNode3 = processNodeService.getOne(qw, false);
             ProcessNodeLink link = new ProcessNodeLink();
             link.setProcessDefinitionId(processDefinitionId);
             link.setProcessNodeId(processNode3.getId());
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java
index 14082b21..10791d35 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java
@@ -110,6 +110,19 @@ public class ProcessHandleServiceImpl implements IProcessHandleService {
                                 .eq(ProcessNodeLink::getProcessInstanceId, processInstanceId)
                                 .eq(ProcessNodeLink::getProcessNodeId, processNode.getId()));
             }
+
+            // 删除各部所主管级领导汇总节点处理人
+            ProcessNode processNode2 = processNodeService.getOne(
+                    new LambdaQueryWrapper<ProcessNode>()
+                            .eq(ProcessNode::getProcessDefinitionId, processDefinitionId)
+                            .eq(ProcessNode::getXmlNodeId, ConsultationTaskKey.DEPART_LEADER_COLLECT_3));
+            if (!Objects.isNull(processNode2)){
+                processNodeLinkService.remove(
+                        new LambdaQueryWrapper<ProcessNodeLink>()
+                                .eq(ProcessNodeLink::getProcessDefinitionId, processDefinitionId)
+                                .eq(ProcessNodeLink::getProcessInstanceId, processInstanceId)
+                                .eq(ProcessNodeLink::getProcessNodeId, processNode2.getId()));
+            }
         }
 
         // 根据流程实例id和任务处理人查询任务