From d5050338f3e7c99c85ec96129e05d24244e01dcb Mon Sep 17 00:00:00 2001 From: Ulric Qin Date: Sat, 11 Dec 2021 18:14:23 +0800 Subject: [PATCH] use last_eval_time for filter --- src/models/alert_his_event.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/models/alert_his_event.go b/src/models/alert_his_event.go index e64a433b..037808cf 100644 --- a/src/models/alert_his_event.go +++ b/src/models/alert_his_event.go @@ -87,7 +87,7 @@ func (e *AlertHisEvent) FillNotifyGroups(cache map[int64]*UserGroup) error { } func AlertHisEventTotal(bgid, stime, etime int64, severity int, recovered int, clusters []string, query string) (int64, error) { - session := DB().Model(&AlertHisEvent{}).Where("trigger_time between ? and ? and group_id = ?", stime, etime, bgid) + session := DB().Model(&AlertHisEvent{}).Where("last_eval_time between ? and ? and group_id = ?", stime, etime, bgid) if severity >= 0 { session = session.Where("severity = ?", severity) @@ -113,7 +113,7 @@ func AlertHisEventTotal(bgid, stime, etime int64, severity int, recovered int, c } func AlertHisEventGets(bgid, stime, etime int64, severity int, recovered int, clusters []string, query string, limit, offset int) ([]AlertHisEvent, error) { - session := DB().Where("trigger_time between ? and ? and group_id = ?", stime, etime, bgid) + session := DB().Where("last_eval_time between ? and ? and group_id = ?", stime, etime, bgid) if severity >= 0 { session = session.Where("severity = ?", severity) -- GitLab