From 6ae6415338d7383a31c8a7366b649d842d0fedde Mon Sep 17 00:00:00 2001
From: yjz <3131811435@qq.com>
Date: Wed, 17 Jan 2024 10:02:47 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E5=BE=81=E6=B1=82=E6=84=8F=E8=A7=81?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B):=2080170?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProcessFbStandardConsultationServiceImpl.java    | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 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 9bf3a41e..a8bf96f9 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
@@ -310,7 +310,7 @@ public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl<Proces
     @Override
     public void transfer(String taskId, String toUserId, String projectId) {
         processHandleService.transfer(taskId, toUserId);
-        // 模块负责人汇总填写意见
+
         Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
         String taskDefinitionKey = task.getTaskDefinitionKey();
         // 设计工程师填写征求意见
@@ -322,8 +322,9 @@ public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl<Proces
                             .eq(ProcessFbConsultationUserLink::getDesignEngineerId, CurrentUserUtil.getId())
                             .set(ProcessFbConsultationUserLink::getDesignEngineerId, toUserId));
         }
-        // 模块负责人汇总填写意见
-        if (ConsultationTaskKey.DEPART_LEADER_START_1.equals(taskDefinitionKey)
+        // 模块负责人分发/模块负责人汇总填写意见
+        if (ConsultationTaskKey.MODULE_OWNER_START.equals(taskDefinitionKey)
+                || ConsultationTaskKey.MODULE_OWNER_END_1.equals(taskDefinitionKey)
                 || ConsultationTaskKey.MODULE_OWNER_END_2.equals(taskDefinitionKey)
                 || ConsultationTaskKey.MODULE_OWNER_END_3.equals(taskDefinitionKey)){
             processFbConsultationUserLinkService.update(
@@ -332,8 +333,9 @@ public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl<Proces
                             .eq(ProcessFbConsultationUserLink::getModuleOwnerId, CurrentUserUtil.getId())
                             .set(ProcessFbConsultationUserLink::getModuleOwnerId, toUserId));
         }
-        // 各部所主管级领导审批
-        if (ConsultationTaskKey.DEPART_LEADER_END_1.equals(taskDefinitionKey)
+        // 各部所主管级领导分发/各部所主管级领导审批
+        if (ConsultationTaskKey.DEPART_LEADER_START_1.equals(taskDefinitionKey)
+                || ConsultationTaskKey.DEPART_LEADER_END_1.equals(taskDefinitionKey)
                 || ConsultationTaskKey.DEPART_LEADER_END_4.equals(taskDefinitionKey)){
             processFbConsultationUserLinkService.update(
                     new LambdaUpdateWrapper<ProcessFbConsultationUserLink>()