Procházet zdrojové kódy

Merge remote-tracking branch 'upstream/dev' into dev

gongzijian před 6 roky
rodič
revize
bcd1d584fa

+ 6 - 2
escheduler-alert/src/main/java/cn/escheduler/alert/utils/MailUtils.java

@@ -103,10 +103,14 @@ public class MailUtils {
     public static Map<String,Object> sendMails(Collection<String> receivers, Collection<String> receiversCc, String title, String content, ShowType showType) {
         Map<String,Object> retMap = new HashMap<>();
         retMap.put(Constants.STATUS, false);
-
+        
+        // if there is no receivers && no receiversCc, no need to process
+        if (CollectionUtils.isEmpty(receivers) && CollectionUtils.isEmpty(receiversCc)) {
+            return retMap;
+        }
 
         receivers.removeIf((from) -> (StringUtils.isEmpty(from)));
-
+        
         if (showType == ShowType.TABLE || showType == ShowType.TEXT){
             // send email
             HtmlEmail email = new HtmlEmail();