0017
/
iot-ui-vue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: fix#15077

This commit is contained in:
XieYongHong 2023-06-07 17:46:43 +08:00
parent 7a8340d3e8
commit d50c028de6
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/views/rule-engine/Scene/Save/action/ListItem/CheckItem.vue
View File

@ -243,12 +243,13 @@ const checkNoticeDelete = async () => {
const itemType = variableDefinitionsMap.get(variableKey) const itemType = variableDefinitionsMap.get(variableKey)
let hasUser = false let hasUser = false
console.log(itemType, notifyType)
if (itemType === 'user') { // 微信用户，钉钉用户 if (itemType === 'user') { // 微信用户，钉钉用户
let resp = undefined; let resp = undefined;
if (notifyType === 'dingTalk') { if (['dingTalk', 'weixin'].includes(notifyType)) {
resp = await noticeConfig.queryDingTalkUsers(item!.notifierId); resp = notifyType === 'dingTalk' ? await noticeConfig.queryDingTalkUsers(item!.notifierId) : await noticeConfig.queryWechatUsers(item!.notifierId);
} else { } else {
resp = await noticeConfig.queryWechatUsers(item!.notifierId); hasUser = true
} }
if (resp && resp.success) { if (resp && resp.success) {
@ -267,10 +268,10 @@ const checkNoticeDelete = async () => {
if (itemType === 'org') { // 组织 if (itemType === 'org') { // 组织
let resp = undefined; let resp = undefined;
if (notifyType === 'dingTalk') { if (['dingTalk', 'weixin'].includes(notifyType)) {
resp = await noticeConfig.dingTalkDept(item!.notifierId) resp = notifyType === 'dingTalk' ? await noticeConfig.dingTalkDept(item!.notifierId) : await noticeConfig.weChatDept(item!.notifierId)
} else { } else {
resp = await noticeConfig.weChatDept(item!.notifierId) hasUser = true
} }
if (resp && resp.success) { if (resp && resp.success) {