Resolve conflict

This commit is contained in:
Louis Lam 2023-05-26 21:38:51 +08:00
parent 0b8dddba24
commit 8ed2b59410

View file

@ -1262,11 +1262,11 @@ class Monitor extends BeanModel {
*/ */
async sendCertNotificationByTargetDays(certCN, certType, daysRemaining, targetDays, notificationList) { async sendCertNotificationByTargetDays(certCN, certType, daysRemaining, targetDays, notificationList) {
let row = await R.getRow("SELECT * FROM notification_sent_history WHERE type = ? AND monitor_id = ? AND days <= ?", [ let row = await R.getRow("SELECT * FROM notification_sent_history WHERE type = ? AND monitor_id = ? AND days <= ?", [
"certificate", "certificate",
this.id, this.id,
targetDays, targetDays,
]); ]);
// Sent already, no need to send again // Sent already, no need to send again
if (row) { if (row) {