From d06cf92f350c4560f7261af7054ac9b0a4776e9a Mon Sep 17 00:00:00 2001
From: "han\\hanst" <songtao.han@xujiesoft.com>
Date: Tue, 24 Mar 2026 08:44:11 +0800
Subject: [PATCH] =?UTF-8?q?=E9=82=AE=E7=AE=B1=E5=88=A4=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ecss/service/impl/CoDelServiceImpl.java   | 23 ++++++++++++++-----
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelServiceImpl.java b/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelServiceImpl.java
index 47fef94c..ff7039cd 100644
--- a/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelServiceImpl.java
+++ b/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelServiceImpl.java
@@ -137,7 +137,8 @@ public class CoDelServiceImpl implements CoDelService {
         String text = "<!DOCTYPE>" + "<div>发货通知单" +data.getDelNo()+"【发票："+
                 data.getCmcInvoice()+"】<span style='color:red'>订单取消</span>" + "</div>";
         String textHead = data.getCmcInvoice()+"【发票："+ data.getCmcInvoice()+"】订单取消";
-        String[] mailAddress = coDelMapper.queryUsersByRoleName("关务仓库",data.getSite()).stream().map(SysUserEntity::getEmail).toArray(String[]::new);
+        String[] mailAddress = coDelMapper.queryUsersByRoleName("关务仓库",data.getSite()).stream()
+                .filter(Objects::nonNull).map(SysUserEntity::getEmail).toArray(String[]::new);
 
         // 安全获取创建人邮箱，防止用户不存在或邮箱为空的空指针异常
         SysUserEntity creator = coDelMapper.queryByUserName(data.getCreateBy());
@@ -161,7 +162,8 @@ public class CoDelServiceImpl implements CoDelService {
         String text = "<!DOCTYPE>" + "<div>发货通知单" +data.getDelNo()+"【发票："+
                 data.getCmcInvoice()+"】<span style='color:green'>取消废弃，恢复正常</span>" + "</div>";
         String textHead = data.getCmcInvoice()+"【发票："+ data.getCmcInvoice()+"】取消废弃";
-        String[] mailAddress = coDelMapper.queryUsersByRoleName("关务仓库",data.getSite()).stream().map(SysUserEntity::getEmail).toArray(String[]::new);
+        String[] mailAddress = coDelMapper.queryUsersByRoleName("关务仓库",data.getSite()).stream()
+                .filter(Objects::nonNull).map(SysUserEntity::getEmail).toArray(String[]::new);
 
         // 安全获取创建人邮箱，防止用户不存在或邮箱为空的空指针异常
         SysUserEntity creator = coDelMapper.queryByUserName(data.getCreateBy());
@@ -185,7 +187,13 @@ public class CoDelServiceImpl implements CoDelService {
             String text = "<!DOCTYPE>" + "<div>发货通知单" +data.getDelNo()+"【发票："+
                     data.getCmcInvoice()+"】<span style='color:red'>已下达</span>" + "</div>";
             String textHead = "发货通知单"+data.getDelNo()+"【发票："+ data.getCmcInvoice()+"】下达";
-            String[] mailAddress = coDelMapper.queryUsersByRoleName("关务仓库",data.getSite()).stream().map(SysUserEntity::getEmail).toArray(String[]::new);
+            String[] mailAddress = coDelMapper
+                    .queryUsersByRoleName("关务仓库", data.getSite())
+                    .stream()
+                    .filter(Objects::nonNull)
+                    .map(SysUserEntity::getEmail)
+                    .filter(email -> email != null && !email.trim().isEmpty())
+                    .toArray(String[]::new);
             if (mailAddress.length>0) {
                 sendMailUtil(textHead, text,mailAddress, data);
             }
@@ -230,7 +238,8 @@ public class CoDelServiceImpl implements CoDelService {
                             ecssCoDelNotifyDetail.get(0).getQty().setScale(0, RoundingMode.HALF_UP)+"</span>"
                             +" 变更后数量：<span style='color:red'>"+data.getQty()+"</span></div>";
                     String textHead = data.getDelNo()+"【发票："+ data.getCmcInvoice()+"】改单[发货数量变更]";
-                    String[] mailAddress = coDelMapper.queryUsersByRoleName("关务仓库",data.getSite()).stream().map(SysUserEntity::getEmail).toArray(String[]::new);
+                    String[] mailAddress = coDelMapper.queryUsersByRoleName("关务仓库",data.getSite()).stream()
+                            .filter(Objects::nonNull).map(SysUserEntity::getEmail).toArray(String[]::new);
 
                     // 安全获取创建人邮箱，防止用户不存在或邮箱为空的空指针异常
                     SysUserEntity creator = coDelMapper.queryByUserName(checkHeader.get(0).getCreateBy());
@@ -257,7 +266,8 @@ public class CoDelServiceImpl implements CoDelService {
                     "<div>PN:<span style='color:red'>" + data.getPn() +"</span> 数量：<span style='color:red'>"+data.getQty()+
                     "</span><span style='color:red'> 新增发货</span></div>";
             String textHead = data.getDelNo()+"【发票："+ data.getCmcInvoice()+"】改单[新增发货]";
-            String[] mailAddress = coDelMapper.queryUsersByRoleName("关务仓库",data.getSite()).stream().map(SysUserEntity::getEmail).toArray(String[]::new);
+            String[] mailAddress = coDelMapper.queryUsersByRoleName("关务仓库",data.getSite()).stream()
+                    .filter(Objects::nonNull).map(SysUserEntity::getEmail).toArray(String[]::new);
 
             // 安全获取创建人邮箱，防止用户不存在或邮箱为空的空指针异常
             SysUserEntity creator = coDelMapper.queryByUserName(checkHeader.get(0).getCreateBy());
@@ -307,7 +317,8 @@ public class CoDelServiceImpl implements CoDelService {
                 "<div>PN:<span style='color:red'>" + data.getPn() +"</span> 数量：<span style='color:red'>"+qty+
                 "</span><span style='color:red'> 取消发货</span></div>";
         String textHead = data.getDelNo()+"【发票："+ data.getCmcInvoice()+"】改单[取消发货]";
-        String[] mailAddress = coDelMapper.queryUsersByRoleName("关务仓库",data.getSite()).stream().map(SysUserEntity::getEmail).toArray(String[]::new);
+        String[] mailAddress = coDelMapper.queryUsersByRoleName("关务仓库",data.getSite()).stream()
+                .filter(Objects::nonNull).map(SysUserEntity::getEmail).toArray(String[]::new);
 
         // 安全获取创建人邮箱，防止用户不存在或邮箱为空的空指针异常
         SysUserEntity creator = coDelMapper.queryByUserName(checkHeader.get(0).getCreateBy());