From ef26ceef9e001cc05d3c20af47d20efb4c96fbb2 Mon Sep 17 00:00:00 2001
From: yjz <3131811435@qq.com>
Date: Fri, 23 Aug 2024 16:38:54 +0800
Subject: [PATCH] =?UTF-8?q?fix(88496):=20=E8=BD=AC=E5=8A=9E=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/StandardInterpretFlow.java         | 13 +++++++++++--
 .../impl/StandardInterpretFlowServiceImpl.java      |  6 ++++++
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/StandardInterpretFlow.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/StandardInterpretFlow.java
index 2c6a0b59..561a1d97 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/StandardInterpretFlow.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/StandardInterpretFlow.java
@@ -96,11 +96,20 @@ public class StandardInterpretFlow implements WorkCenterService {
     @Override
     public void handleTransfer(ProcessAll processAll, ProcessApprovalRecord processApprovalRecord,
                                String toUserId, String userId) {
+        String node = processApprovalRecord.getNodeId();
         ProcessAllService processAllService = SpringContextUtil.getBean(ProcessAllService.class);
         // 更新流程人员变量
-//        processAllService.specialTransfer(processAll, processApprovalRecord, toUserId, userId);
+        processAllService.specialTransfer(processAll, processApprovalRecord, toUserId, userId);
+        // 标准主解读人分发（分发）
+        if (StandardInterpretCommon.MASTER_INTERPRET_DISTRIBUTE.equals(node)){
+            ProcessStandardInterpretService processStandardInterpretService =
+                    SpringContextUtil.getBean(ProcessStandardInterpretService.class);
+            processStandardInterpretService.update(
+                    new LambdaUpdateWrapper<ProcessStandardInterpret>()
+                            .eq(ProcessStandardInterpret::getProjectId, processAll.getProjectId())
+                            .set(ProcessStandardInterpret::getMasterInterpretId, toUserId));
+        }
         // 解读人填写信息（分发）
-        String node = processApprovalRecord.getNodeId();
         if (StandardInterpretCommon.INTERPRETING_PEOPLE_FILLOUT.equals(node)){
             StandardInterpretFlowService standardInterpretFlowService =
                     SpringContextUtil.getBean(StandardInterpretFlowService.class);
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/StandardInterpretFlowServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/StandardInterpretFlowServiceImpl.java
index cfbe5ea9..a548af27 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/StandardInterpretFlowServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/StandardInterpretFlowServiceImpl.java
@@ -383,6 +383,7 @@ public class StandardInterpretFlowServiceImpl implements StandardInterpretFlowSe
                     new LambdaQueryWrapper<ProcessStandardInterpret>()
                             .eq(ProcessStandardInterpret::getProjectId, processAlls.getProjectId()));
             if (!Objects.isNull(processStandardInterpret)){
+                variables.put(StandardInterpretCommon.MASTER_INTERPRET, processStandardInterpret.getMasterInterpretId());
                 String id = processStandardInterpret.getId();
                 LambdaQueryWrapper<ProcessStandardInterpretClause> queryWrapper = new LambdaQueryWrapper<>();
                 queryWrapper.eq(ProcessStandardInterpretClause::getStandardInterpretId, id);
@@ -443,6 +444,11 @@ public class StandardInterpretFlowServiceImpl implements StandardInterpretFlowSe
 
             }
         }else if (StandardInterpretCommon.AUTO_TASK_2.equals(taskDefinitionKey)){
+            // 获取主流程的主解读人id
+            ProcessStandardInterpret processStandardInterpret = processStandardInterpretService.getOne(
+                    new LambdaQueryWrapper<ProcessStandardInterpret>()
+                            .eq(ProcessStandardInterpret::getProjectId, processAlls.getProjectId()));
+            variables.put(StandardInterpretCommon.MASTER_INTERPRET, processStandardInterpret.getMasterInterpretId());
             StandardInterpretFlowDTO standardInterpretFlowDTO = new StandardInterpretFlowDTO();
             // 流程信息
             String newSnowFlake = String.valueOf(SnowflakeUtils.snowflake());