diff --git a/src/models/alert_his_event.go b/src/models/alert_his_event.go index e64a433b5e6b5976836e58e6ae802d621add8d50..037808cfca8c32ac5523bf35f091f1b8e21c6b24 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)