From d50c028de6700c677ca0e3d4c5607b3a7cb2539a Mon Sep 17 00:00:00 2001 From: XieYongHong <18010623010@163.com> Date: Wed, 7 Jun 2023 17:46:43 +0800 Subject: [PATCH] feat: fix#15077 --- .../Scene/Save/action/ListItem/CheckItem.vue | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/views/rule-engine/Scene/Save/action/ListItem/CheckItem.vue b/src/views/rule-engine/Scene/Save/action/ListItem/CheckItem.vue index 6f28a886..3aba69b1 100644 --- a/src/views/rule-engine/Scene/Save/action/ListItem/CheckItem.vue +++ b/src/views/rule-engine/Scene/Save/action/ListItem/CheckItem.vue @@ -243,12 +243,13 @@ const checkNoticeDelete = async () => { const itemType = variableDefinitionsMap.get(variableKey) let hasUser = false + console.log(itemType, notifyType) if (itemType === 'user') { // 微信用户,钉钉用户 let resp = undefined; - if (notifyType === 'dingTalk') { - resp = await noticeConfig.queryDingTalkUsers(item!.notifierId); + if (['dingTalk', 'weixin'].includes(notifyType)) { + resp = notifyType === 'dingTalk' ? await noticeConfig.queryDingTalkUsers(item!.notifierId) : await noticeConfig.queryWechatUsers(item!.notifierId); } else { - resp = await noticeConfig.queryWechatUsers(item!.notifierId); + hasUser = true } if (resp && resp.success) { @@ -267,10 +268,10 @@ const checkNoticeDelete = async () => { if (itemType === 'org') { // 组织 let resp = undefined; - if (notifyType === 'dingTalk') { - resp = await noticeConfig.dingTalkDept(item!.notifierId) + if (['dingTalk', 'weixin'].includes(notifyType)) { + resp = notifyType === 'dingTalk' ? await noticeConfig.dingTalkDept(item!.notifierId) : await noticeConfig.weChatDept(item!.notifierId) } else { - resp = await noticeConfig.weChatDept(item!.notifierId) + hasUser = true } if (resp && resp.success) {