From 813b99b2767fc6989faf387870c36d28e5794c8d Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Mon, 1 Nov 2021 14:20:53 +0800
Subject: [PATCH] =?UTF-8?q?fix=20bug=2041759=20=E6=88=91=E7=9A=84=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF--=E5=B7=A5=E4=BD=9C=E7=BB=84=E4=B8=8B=E6=9C=89?=
 =?UTF-8?q?=E6=88=90=E5=91=98--=E6=96=B0=E5=A2=9E=E5=AE=8C=E4=BC=9A?=
 =?UTF-8?q?=E8=AE=AE=E4=BC=9A=E6=94=B6=E5=88=B0=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/PayMeetingServiceImpl.java   | 39 +++++++++----------
 1 file changed, 18 insertions(+), 21 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java
index 94c663f5..81c88702 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java
@@ -148,24 +148,6 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
             }
             pushStandardsFiles(fileIdList);
         }
-        //工作组会议发送通知
-        if (Objects.equals(payMeeting.getMeetingType(), Integer.parseInt(MeetingCommon.WORKING_GROUP_MEETING))) {
-            String workingGroupId = payMeeting.getWorkingGroupId();
-            LambdaQueryWrapper<PayWorkingGroupSubItem> wrapper = new LambdaQueryWrapper<>();
-            wrapper.eq(PayWorkingGroupSubItem::getWorkingGroupId, workingGroupId);
-            List<PayWorkingGroupSubItem> groupSubItemList = payWorkingGroupSubItemService.list(wrapper);
-            for (PayWorkingGroupSubItem payWorkingGroupSubItem : groupSubItemList) {
-                String chargeCompanyId = payWorkingGroupSubItem.getChargeCompanyId();
-                //根据企业id查询所有联系人
-                List<PayContactsManagement> list = payContactsManagementService.list(
-                        new LambdaQueryWrapper<PayContactsManagement>()
-                                .eq(PayContactsManagement::getCompanyId, chargeCompanyId)
-                );
-                for (PayContactsManagement payContactsManagement : list) {
-                    sendMessage(payMeeting, payContactsManagement);
-                }
-            }
-        }
     }
 
     /**
@@ -444,11 +426,13 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
         //组装查询联系人条件
         LambdaQueryWrapper<PayContactsManagement> wrapper = new LambdaQueryWrapper<>();
         List<String> contactsIdList = new ArrayList<>();
+        String workingGroupId = null;
         //工作组项目查询公司
         if (Objects.equals(projectType, 1)) {
             List<PayWorkingGroupSubItem> payWorkingGroupSubItems = payWorkingGroupSubItemService.listByIds(subitemIds);
             //把单位会员中所有的联系人取出
             for (PayWorkingGroupSubItem payWorkingGroupSubItem : payWorkingGroupSubItems) {
+                workingGroupId = payWorkingGroupSubItem.getWorkingGroupId();
                 String groupSubItemId = payWorkingGroupSubItem.getId();
                 String contactsIdOne = payWorkingGroupSubItem.getContactsIdOne();
                 if (StringUtils.isNotBlank(contactsIdOne)) {
@@ -458,6 +442,7 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
                                     .setSubitemId(groupSubItemId)
                                     .setContactId(contactsIdOne)
                     );
+
                 }
                 String contactsIdTwo = payWorkingGroupSubItem.getContactsIdTwo();
                 if (StringUtils.isNotBlank(contactsIdTwo)) {
@@ -504,10 +489,22 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
             meetingIdList.add(meetingId);
             payMeeting.setRemind(MeetingCommon.REMIND_1);
             saveOrUpdate(payMeeting);
+            String fromUser = null;
+            //工作组项目用工作组负责人A发邮件
+            if (Objects.nonNull(workingGroupId)) {
+                PayWorkingGroup workingGroup = payWorkingGroupService.getById(workingGroupId);
+                String principalIdA = workingGroup.getPrincipalIdA();
+                LoginUser userById = sysBaseAPI.getUserById(principalIdA);
+                fromUser = userById.getUsername();
+            }
             //发送消息
             for (PayContactsManagement payContactsManagement : list) {
-                String directorId = payMeeting.getDirectorId();
-                LoginUser director = sysBaseAPI.getUserById(directorId);
+                if (Objects.isNull(fromUser)) {
+                    String directorId = payMeeting.getDirectorId();
+                    LoginUser director = sysBaseAPI.getUserById(directorId);
+                    fromUser = director.getUsername();
+                }
+
                 // 给企业联系人发送消息
                 String email = payContactsManagement.getEmail();
                 String phone = payContactsManagement.getPhone();
@@ -522,7 +519,7 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
                 sendMessageDTO.setToUser(PasswordUtil.decrypt(phone));
                 sendMessageDTO.setPhone(PasswordUtil.decrypt(phone));
 
-                sendMessageDTO.setFromUser(director.getUsername());
+                sendMessageDTO.setFromUser(fromUser);
                 sendMessageDTO.setTemplateCode(companyMessageEnums.getCode());
                 sendMessageDTO.setTemplateParam(map);
                 sendMessageDTO.setBusType(busType);