From 27b3ba1fffe932ea44cfd478c8d078bf82da1e88 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Wed, 31 Jan 2024 20:25:02 +0800
Subject: [PATCH] =?UTF-8?q?fix=2081455=20=E6=B3=95=E8=A7=84=E5=90=88?=
 =?UTF-8?q?=E8=A7=84=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B-=E6=B3=95?=
 =?UTF-8?q?=E8=A7=84=E5=B7=A5=E7=A8=8B=E5=B8=88=E5=AE=A1=E6=89=B9=E8=8A=82?=
 =?UTF-8?q?=E7=82=B9=EF=BC=8C=E9=80=89=E6=8B=A9=E6=8A=84=E9=80=81=E4=BA=BA?=
 =?UTF-8?q?=E5=91=98=EF=BC=8C=E6=94=B6=E5=88=B0=E6=B6=88=E6=81=AF=E4=B8=8D?=
 =?UTF-8?q?=E5=AF=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProcessProjectStandardService.java        | 29 ++++++++++---------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java
index a1596149..39f890ae 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java
@@ -564,7 +564,7 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
         //查询表单
         ProcessProjectStandardVO businessInfoDTO = processInfoVO.getBusinessInfoDTO();
         List<ProcessProjectStandardTerm> termList = businessInfoDTO.getProcessProjectStandardTermList();
-        List<String> carbonCopyPersonnelList = new ArrayList<>();
+
         List<ProcessProjectStandardTerm> updateTermList = new ArrayList<>();
         List<ProcessProjectStandardTermUser> updateTermUserList = new ArrayList<>();
         Date date = new Date();
@@ -579,7 +579,6 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
             term1.setId(termId);
             term1.setDesignEngineer(designEngineer);
             updateTermList.add(term1);
-            carbonCopyPersonnelList.addAll(Arrays.asList(term.getCarbonCopyPersonnels().split(",")));
 
             LawsSpecialProjectLibrary projectLibrary = new LawsSpecialProjectLibrary();
             projectLibrary.setSource(processProjectStandard.getSource());
@@ -671,17 +670,21 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
 
         taskService.complete(taskId, variables);
         if (pass){
-            //发送消息
-            String carbonCopyPersonnels = carbonCopyPersonnelList.stream().distinct().collect(Collectors.joining(","));
-            SendMessageDTO sendMessageDTO = new SendMessageDTO();
-            sendMessageDTO.setTemplateCode(MessageTemplateCodeCommon.PROJECT_STANDARD_COMPLETE);
-            sendMessageDTO.setToUserId(carbonCopyPersonnels);
-            Map<String, String> sendMap = new HashMap<>();
-            sendMap.put("prcName", process.getPrcName());
-            sendMap.put("termNumber", process.getPrcName());
-            sendMap.put("termName", process.getPrcName());
-            sendMessageDTO.setMap(sendMap);
-            sendMessageAPI.sendMessage(sendMessageDTO);
+            for (ProcessProjectStandardTerm term : termList) {
+                List<String> carbonCopyPersonnelList = Arrays.asList(term.getCarbonCopyPersonnels().split(","));
+                //发送消息
+                String carbonCopyPersonnels = carbonCopyPersonnelList.stream().distinct().collect(Collectors.joining(","));
+                SendMessageDTO sendMessageDTO = new SendMessageDTO();
+                sendMessageDTO.setTemplateCode(MessageTemplateCodeCommon.PROJECT_STANDARD_COMPLETE);
+                sendMessageDTO.setToUserId(carbonCopyPersonnels);
+                Map<String, String> sendMap = new HashMap<>();
+                sendMap.put("prcName", process.getPrcName());
+                sendMap.put("termNumber", term.getTermNumber());
+                sendMap.put("termName", term.getTermName());
+                sendMessageDTO.setMap(sendMap);
+                sendMessageAPI.sendMessage(sendMessageDTO);
+            }
+
         }
 
     }