diff --git a/server/model/monitor.js b/server/model/monitor.js index 5b7e5871..da0c0d5c 100644 --- a/server/model/monitor.js +++ b/server/model/monitor.js @@ -1508,10 +1508,8 @@ class Monitor extends BeanModel { return await R.getAll(` SELECT monitor_notification.monitor_id, monitor_notification.notification_id FROM monitor_notification - WHERE monitor_notification.monitor_id IN (?) - `, [ - monitorIDs, - ]); + WHERE monitor_notification.monitor_id IN (${monitorIDs.map((_) => "?").join(",")}) + `, monitorIDs); } /** @@ -1521,13 +1519,11 @@ class Monitor extends BeanModel { */ static async getMonitorTag(monitorIDs) { return await R.getAll(` - SELECT monitor_tag.monitor_id, tag.name, tag.color + SELECT monitor_tag.monitor_id, monitor_tag.tag_id, tag.name, tag.color FROM monitor_tag JOIN tag ON monitor_tag.tag_id = tag.id - WHERE monitor_tag.monitor_id IN (?) - `, [ - monitorIDs, - ]); + WHERE monitor_tag.monitor_id IN (${monitorIDs.map((_) => "?").join(",")}) + `, monitorIDs); } /** @@ -1567,6 +1563,7 @@ class Monitor extends BeanModel { tagsMap.set(row.monitor_id, []); } tagsMap.get(row.monitor_id).push({ + tag_id: row.tag_id, name: row.name, color: row.color });