diff --git a/escheduler-alert/src/main/java/cn/escheduler/alert/utils/MailUtils.java b/escheduler-alert/src/main/java/cn/escheduler/alert/utils/MailUtils.java index 3675d4c919..0e514ffee6 100644 --- a/escheduler-alert/src/main/java/cn/escheduler/alert/utils/MailUtils.java +++ b/escheduler-alert/src/main/java/cn/escheduler/alert/utils/MailUtils.java @@ -102,16 +102,15 @@ public class MailUtils { */ public static Map sendMails(Collection receivers, Collection receiversCc, String title, String content, ShowType showType) { Map retMap = new HashMap<>(); - - receivers.removeIf((from) -> (StringUtils.isEmpty(from))); - + retMap.put(Constants.STATUS, false); + // if there is no receivers && no receiversCc, no need to process if (CollectionUtils.isEmpty(receivers) && CollectionUtils.isEmpty(receiversCc)) { - retMap.put(Constants.STATUS, true); return retMap; } - retMap.put(Constants.STATUS, false); + receivers.removeIf((from) -> (StringUtils.isEmpty(from))); + if (showType == ShowType.TABLE || showType == ShowType.TEXT){ // send email HtmlEmail email = new HtmlEmail();