From 056e1448d04b29570c98878a47459db8aa231bb1 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Wed, 13 Dec 2023 13:39:57 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=AE=9A=E6=97=B6=E6=8A=A5=E5=91=8A?= =?UTF-8?q?=E8=BF=87=E6=BB=A4=E6=8E=89=E5=B7=B2=E7=A6=81=E7=94=A8=E7=94=A8?= =?UTF-8?q?=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../strategy/impl/EmailTaskHandler.java | 33 ++++++++----------- 1 file changed, 14 insertions(+), 19 deletions(-) diff --git a/core/backend/src/main/java/io/dataease/job/sechedule/strategy/impl/EmailTaskHandler.java b/core/backend/src/main/java/io/dataease/job/sechedule/strategy/impl/EmailTaskHandler.java index 84acb72a59..c0f36f355f 100644 --- a/core/backend/src/main/java/io/dataease/job/sechedule/strategy/impl/EmailTaskHandler.java +++ b/core/backend/src/main/java/io/dataease/job/sechedule/strategy/impl/EmailTaskHandler.java @@ -181,7 +181,7 @@ public class EmailTaskHandler extends TaskHandler implements Job { String reciUsers = emailTemplateDTO.getReciUsers(); List reciLists = null; if (StringUtils.isNotBlank(reciUsers)) { - String emailUsers = Arrays.stream(reciUsers.split(",")).map(userService::getUserByName).filter(tempUser -> StringUtils.isNotBlank(tempUser.getEmail())).map(SysUserEntity::getEmail).collect(Collectors.joining(",")); + String emailUsers = Arrays.stream(reciUsers.split(",")).map(userService::getUserByName).filter(tempUser -> StringUtils.isNotBlank(tempUser.getEmail()) && 1 == tempUser.getEnabled()).map(SysUserEntity::getEmail).collect(Collectors.joining(",")); if (StringUtils.isNotBlank(emailUsers)) { if (StringUtils.isNotBlank(recipients)) { recipients += "," + emailUsers; @@ -232,8 +232,7 @@ public class EmailTaskHandler extends TaskHandler implements Job { } List errorMsgs = new ArrayList<>(); - for (int i = 0; i < channels.size(); i++) { - String channel = channels.get(i); + for (String channel : channels) { switch (channel) { case "email": if (StringUtils.isNotBlank(recipients)) @@ -252,12 +251,11 @@ public class EmailTaskHandler extends TaskHandler implements Job { } break; case "wecom": - if (SpringContextUtil.getBean(AuthUserService.class).supportWecom()) { + if (SpringContextUtil.getBean(AuthUserService.class).supportWecom() && CollectionUtils.isNotEmpty(reciLists)) { List wecomUsers = new ArrayList<>(); - for (int j = 0; j < reciLists.size(); j++) { - String reci = reciLists.get(j); + for (String reci : reciLists) { SysUserEntity userBySub = userService.getUserByName(reci); - if (ObjectUtils.isEmpty(userBySub)) continue; + if (ObjectUtils.isEmpty(userBySub) || 1 != userBySub.getEnabled()) continue; Long userId = userBySub.getUserId(); SysUserAssist sysUserAssist = sysUserService.assistInfo(userId); if (ObjectUtils.isEmpty(sysUserAssist) || StringUtils.isBlank(sysUserAssist.getWecomId())) @@ -277,12 +275,11 @@ public class EmailTaskHandler extends TaskHandler implements Job { } break; case "dingtalk": - if (SpringContextUtil.getBean(AuthUserService.class).supportDingtalk()) { + if (SpringContextUtil.getBean(AuthUserService.class).supportDingtalk() && CollectionUtils.isNotEmpty(reciLists)) { List dingTalkUsers = new ArrayList<>(); - for (int j = 0; j < reciLists.size(); j++) { - String reci = reciLists.get(j); + for (String reci : reciLists) { SysUserEntity userBySub = userService.getUserByName(reci); - if (ObjectUtils.isEmpty(userBySub)) continue; + if (ObjectUtils.isEmpty(userBySub) || 1 != userBySub.getEnabled()) continue; Long userId = userBySub.getUserId(); SysUserAssist sysUserAssist = sysUserService.assistInfo(userId); if (ObjectUtils.isEmpty(sysUserAssist) || StringUtils.isBlank(sysUserAssist.getDingtalkId())) @@ -302,12 +299,11 @@ public class EmailTaskHandler extends TaskHandler implements Job { } break; case "lark": - if (SpringContextUtil.getBean(AuthUserService.class).supportLark()) { + if (SpringContextUtil.getBean(AuthUserService.class).supportLark() && CollectionUtils.isNotEmpty(reciLists)) { List larkUsers = new ArrayList<>(); - for (int j = 0; j < reciLists.size(); j++) { - String reci = reciLists.get(j); + for (String reci : reciLists) { SysUserEntity userBySub = userService.getUserByName(reci); - if (ObjectUtils.isEmpty(userBySub)) continue; + if (ObjectUtils.isEmpty(userBySub) || 1 != userBySub.getEnabled()) continue; Long userId = userBySub.getUserId(); SysUserAssist sysUserAssist = sysUserService.assistInfo(userId); if (ObjectUtils.isEmpty(sysUserAssist) || StringUtils.isBlank(sysUserAssist.getLarkId())) @@ -327,12 +323,11 @@ public class EmailTaskHandler extends TaskHandler implements Job { } break; case "larksuite": - if (SpringContextUtil.getBean(AuthUserService.class).supportLarksuite()) { + if (SpringContextUtil.getBean(AuthUserService.class).supportLarksuite() && CollectionUtils.isNotEmpty(reciLists)) { List larksuiteUsers = new ArrayList<>(); - for (int j = 0; j < reciLists.size(); j++) { - String reci = reciLists.get(j); + for (String reci : reciLists) { SysUserEntity userBySub = userService.getUserByName(reci); - if (ObjectUtils.isEmpty(userBySub)) continue; + if (ObjectUtils.isEmpty(userBySub) || 1 != userBySub.getEnabled()) continue; Long userId = userBySub.getUserId(); SysUserAssist sysUserAssist = sysUserService.assistInfo(userId); if (ObjectUtils.isEmpty(sysUserAssist) || StringUtils.isBlank(sysUserAssist.getLarksuiteId()))