From 9c0fa5cb668b1e1119d77090c4905e566ceedb8e Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Thu, 27 Jul 2023 18:35:01 +0800
Subject: [PATCH] =?UTF-8?q?fix=2074162=20=E5=88=86=E5=8F=91=E5=90=8E?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E8=AF=AD=E6=9C=89=E7=BC=BA=E5=A4=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PayWorkingGroupDistributionRecordServiceImpl.java | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 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 8c1a9ec0..30f9de62 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
@@ -205,17 +205,19 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl<Pa
             throw new JeroBootException("分发失败！");
         }
         // 发送消息
+        int success = list.size();
+        int failed = 0;
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         String finalMsg = msg;
         List<String> listMsg = new ArrayList<>();
-        list.forEach(p->{
+        for (PayContactsManagementTemporary p : list) {
             try {
                 List<PayWorkingGroupDistributionRecord> listStr = listPayWorkingGroupDistributionRecord.stream().filter(item->
                         (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)){
-                    return;
+                    continue;
                 }
 
                 // 发送消息
@@ -249,10 +251,13 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl<Pa
                 }
             }catch (Exception e){
                 if(e.getMessage().contains("邮件发送") && !listMsg.contains(p.getName() + "邮件发送失败")){
+                    success--;
+                    failed++;
                     listMsg.add(p.getCompanyName()+"-"+p.getName() + "邮件发送失败");
                 }
             }
-        });
+        }
+        listMsg.add(0,"成功"+success+"条数据，失败"+failed+"条数据");
         return listMsg;
     }