From 3b726c5f4cb2dd82544f8a31ecd0bf42628569d9 Mon Sep 17 00:00:00 2001
From: yjz <3131811435@qq.com>
Date: Fri, 26 Jan 2024 09:02:51 +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):=2080302?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ProcessFbEntryChangeServiceImpl.java | 20 ++++++++++++-------
 ...cessFbStandardConsultationServiceImpl.java |  3 +++
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java
index 8b31858c..56601b59 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java
@@ -297,19 +297,22 @@ public class ProcessFbEntryChangeServiceImpl extends ServiceImpl<ProcessFbEntryC
         String replacedOld = (String) oldMap.get(FieldCommon.REPLACED_STANDARD); // 代替标准
         String referenceOld = (String) oldMap.get(FieldCommon.REFERENCE_STANDARD); // 引用标准
 
-        String userId = "";
-        String templateCode = "";
-        if (StringUtils.isNotBlank(replaced) && !replaced.equals(replacedOld) && StringUtils.isNotBlank(replacedOld)) { // 代替标准
-            List<String> replacedOldList = Arrays.asList(replacedOld.split(","));
+        if (StringUtils.isNotBlank(replaced) && !replaced.equals(replacedOld)) { // 代替标准
+            String userId = "";
+            String templateCode = "";
+            List<String> replacedList = Arrays.asList(replaced.split(","));
             LambdaQueryWrapper<ProcessFbEntryChange> queryWrapper = new LambdaQueryWrapper<>();
-            queryWrapper.in(ProcessFbEntryChange::getStandardNumber, replacedOldList);
+            queryWrapper.in(ProcessFbEntryChange::getStandardNumber, replacedList);
             queryWrapper.eq(ProcessFbEntryChange::getOperateType, "1");
             List<ProcessFbEntryChange> processFbEntryChangeList = list(queryWrapper);
             userId = processFbEntryChangeList.stream().map(ProcessFbEntryChange::getUserId).collect(Collectors.joining(","));
             templateCode = MessageTemplateCodeCommon.STANDARD_CHANGE_REPLACE;
+            sendMsg(objectMap, module, standardNumber, standardName, oldMap, userId, templateCode);
         }
 
-        if (StringUtils.isNotBlank(reference) && !reference.equals(referenceOld)) { // 引用标准
+//        if (StringUtils.isNotBlank(reference) && !reference.equals(referenceOld)) { // 引用标准
+            String userId = "";
+            String templateCode = "";
             List<LawsReplacedStandard> lawsReplacedStandardList = lawsReplacedStandardService.list(
                     new LambdaQueryWrapper<LawsReplacedStandard>()
                             .eq(LawsReplacedStandard::getReplaced, standardNumber));
@@ -324,8 +327,11 @@ public class ProcessFbEntryChangeServiceImpl extends ServiceImpl<ProcessFbEntryC
                 }
             }
             templateCode = MessageTemplateCodeCommon.STANDARD_CHANGE_REFERENCE;
-        }
+            sendMsg(objectMap, module, standardNumber, standardName, oldMap, userId, templateCode);
+//        }
+    }
 
+    private void sendMsg(Map<String, Object> objectMap, String module, String standardNumber, String standardName, Map<String, Object> oldMap, String userId, String templateCode) {
         if (StringUtils.isNotBlank(userId)) {
             String content = getContent(objectMap, oldMap, module);
             SendMessageDTO sendMessageDTO = new SendMessageDTO();
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 8aa705be..a8a61c78 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
@@ -335,6 +335,7 @@ public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl<Proces
 
         Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
         String taskDefinitionKey = task.getTaskDefinitionKey();
+        String executionId = task.getExecutionId();
         // 设计工程师填写征求意见
         if (ConsultationTaskKey.DESIGN_ENGINEER_1.equals(taskDefinitionKey)
                 || ConsultationTaskKey.DESIGN_ENGINEER_2.equals(taskDefinitionKey)){
@@ -354,6 +355,8 @@ public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl<Proces
                             .eq(ProcessFbConsultationUserLink::getBusinessId, projectId)
                             .eq(ProcessFbConsultationUserLink::getModuleOwnerId, CurrentUserUtil.getId())
                             .set(ProcessFbConsultationUserLink::getModuleOwnerId, toUserId));
+
+            runtimeService.setVariable(executionId, "moduleOwner", toUserId);
         }
         // 各部所主管级领导分发/各部所主管级领导审批
         if (ConsultationTaskKey.DEPART_LEADER_START_1.equals(taskDefinitionKey)