From 2d5331dda28d7c1103dfe3cc4d9f3cd08295f883 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <liangqitao@syxysoft.com>
Date: Mon, 15 Jan 2024 18:21:48 +0800
Subject: [PATCH] fix:80847

---
 ...ingGroupDistributionRecordServiceImpl.java | 31 ++++++++++++++-----
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupDistributionRecordServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupDistributionRecordServiceImpl.java
index 80f73a64..691ba860 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupDistributionRecordServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupDistributionRecordServiceImpl.java
@@ -247,14 +247,6 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl<Pa
         List<String> listMsg = new ArrayList<>();
         for (PayContactsManagementTemporary p : list) {
             try {
-                List<PayWorkingGroupDistributionRecord> listStr = listPayWorkingGroupDistributionRecord.stream().filter(item->
-                        (payWorkingGroupDistributionRecord.getProjectType() == PayProjectCommon.PROJECT_TYPE_FILE4) ?
-                                Objects.equals(item.getTemporaryContactsId(),p.getId()) :
-                                Objects.equals(item.getContactsId(),p.getId())).collect(Collectors.toList());
-                if(CollectionUtils.isEmpty(listStr)){
-                    continue;
-                }
-
                 // 发送消息
                 SendMessageDTO sendMessageDTO = new SendMessageDTO();
                 Integer sendEmailFlag = payWorkingGroupDistributionRecord.getSendEmailFlag();
@@ -275,9 +267,32 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl<Pa
                 sendMessageDTO.setBusType("C_OPEN_TYPE12");
                 JSONObject json = new JSONObject();
                 if(Objects.equals(payWorkingGroupDistributionRecord.getProjectType(),PayProjectCommon.PROJECT_TYPE_FILE1)){
+                    List<PayWorkingGroupDistributionRecord> listStr = listPayWorkingGroupDistributionRecord.stream().filter(item->
+                            Objects.equals(payWorkingGroupDistributionRecord.getProjectType(),PayProjectCommon.PROJECT_TYPE_FILE1) ?
+                                    Objects.equals(item.getTemporaryContactsId(),p.getId()) :
+                                    Objects.equals(item.getContactsId(),p.getId())).collect(Collectors.toList());
+                    if(CollectionUtils.isEmpty(listStr)){
+                        continue;
+                    }
                     json.put("id",listStr.get(0).getSubId());
                 }else if(Objects.equals(payWorkingGroupDistributionRecord.getProjectType(),PayProjectCommon.PROJECT_TYPE_FILE2)){
+                    List<PayWorkingGroupDistributionRecord> listStr = listPayWorkingGroupDistributionRecord.stream().filter(item->
+                            Objects.equals(payWorkingGroupDistributionRecord.getProjectType(),PayProjectCommon.PROJECT_TYPE_FILE2) ?
+                                    Objects.equals(item.getTemporaryContactsId(),p.getId()) :
+                                    Objects.equals(item.getContactsId(),p.getId())).collect(Collectors.toList());
+                    if(CollectionUtils.isEmpty(listStr)){
+                        continue;
+                    }
                     json.put("id",listStr.get(0).getProjectId());
+                }else if(Objects.equals(payWorkingGroupDistributionRecord.getProjectType(),PayProjectCommon.PROJECT_TYPE_FILE4)){
+                    List<PayWorkingGroupDistributionRecord> listStr = listPayWorkingGroupDistributionRecord.stream().filter(item->
+                            Objects.equals(payWorkingGroupDistributionRecord.getProjectType(),PayProjectCommon.PROJECT_TYPE_FILE4) ?
+                                    Objects.equals(item.getTemporaryContactsId(),p.getId()) :
+                                    Objects.equals(item.getContactsId(),p.getId())).collect(Collectors.toList());
+                    if(CollectionUtils.isEmpty(listStr)){
+                        continue;
+                    }
+                    json.put("id",listStr.get(0).getSubId());
                 }
                 sendMessageDTO.setBusId(json.toJSONString());
                 sendMessageService.SendMessageService(sendMessageDTO);