From 014c9e3195eb6f4f5ee10e75981fa3e03dd22505 Mon Sep 17 00:00:00 2001 From: "gao.zhiyuan" Date: Wed, 9 Nov 2022 11:00:12 +0800 Subject: [PATCH] bindAnixinStrucRes anxinyun --- api/app/lib/controllers/alarm/data.js | 2 -- api/app/lib/controllers/push/config.js | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/api/app/lib/controllers/alarm/data.js b/api/app/lib/controllers/alarm/data.js index 13f42fd..a2cd793 100644 --- a/api/app/lib/controllers/alarm/data.js +++ b/api/app/lib/controllers/alarm/data.js @@ -40,10 +40,8 @@ async function list (ctx) { ctx, pepProjectId, keywordTarget, keyword }) let whereOption = [] - // ! 1 开发临时增加 if (anxinStruc.length) { const anxinStrucIds = anxinStruc.map(a => a.strucId) - // ! 开发临时注释 whereOption.push(`alarms.StructureId IN (${anxinStrucIds.join(",")})`) if (groupId) { diff --git a/api/app/lib/controllers/push/config.js b/api/app/lib/controllers/push/config.js index f9fdfb2..5308865 100644 --- a/api/app/lib/controllers/push/config.js +++ b/api/app/lib/controllers/push/config.js @@ -34,7 +34,7 @@ async function list (ctx) { if (keywordTarget == 'tactics') { findOption.where.name = { $like: `%${keyword}%` } } else if (keywordTarget == 'struc') { - let bindAnixinStrucRes = await clickHouse.projectManage.query(` + let bindAnixinStrucRes = await clickHouse.anxinyun.query(` SELECT id, name FROM t_structure WHERE name LIKE '%${keyword}%' `).toPromise()