fix:邮箱判空

server-common/src/main/java/com/makeit/utils/msg/sender/MailMsgSender.java

@@ -3,6 +3,7 @@ package com.makeit.utils.msg.sender;
 import com.makeit.utils.msg.SendTypeEnum;
 import com.makeit.utils.msg.SendTypeEnum;
 import com.makeit.utils.msg.dto.MsgSendDTO;
 import com.makeit.utils.msg.dto.MsgSendDTO;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.mail.javamail.JavaMailSender;
 import org.springframework.mail.javamail.JavaMailSender;
@@ -10,6 +11,8 @@ import org.springframework.mail.javamail.MimeMessageHelper;
 import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Component;
 
 
 import javax.mail.internet.MimeMessage;
 import javax.mail.internet.MimeMessage;
+import java.util.Collection;
+import java.util.Objects;
 
 
 @Component
 @Component
 @Slf4j
 @Slf4j
@@ -35,7 +38,12 @@ public class MailMsgSender implements IMsgSender {
             MimeMessage message = mailSender.createMimeMessage();
             MimeMessage message = mailSender.createMimeMessage();
             MimeMessageHelper helper = new MimeMessageHelper(message, true);
             MimeMessageHelper helper = new MimeMessageHelper(message, true);
             helper.setFrom(from);
             helper.setFrom(from);
-            helper.setTo(msgDTO.getEmailSet().toArray(new String[msgDTO.getReceiverList().size()]));
+            Collection<String> emailSet = msgDTO.getEmailSet();
+            emailSet.removeIf(Objects::isNull);
+            if(CollectionUtils.isEmpty(emailSet)){
+                return;
+            }
+            helper.setTo(emailSet.toArray(new String[emailSet.size()]));
             helper.setSubject(msgDTO.getSubject());
             helper.setSubject(msgDTO.getSubject());
             helper.setText(msgDTO.getOriContent(), false);
             helper.setText(msgDTO.getOriContent(), false);
             mailSender.send(message);
             mailSender.send(message);