diff --git a/src/service/alert_rules.go b/src/service/alert_rules.go index b8598c5f3bc35568d56e23021cf4ad032dac2e35..8f6b77157f4363b6e3d62ce6fc33bb3643fcde3b 100644 --- a/src/service/alert_rules.go +++ b/src/service/alert_rules.go @@ -298,7 +298,9 @@ func (a *AlertRulesSvc) List(req request.ListAlertRules) (resp response.AlertRul Or("ac.class_name LIKE ?", "%"+req.Keyword+"%"). Or("acp.class_name LIKE ?", "%"+req.Keyword+"%") } - resp.TotalCount, err = session.Limit(req.GetPageSize(), (req.GetPage()-1)*req.GetPageSize()).FindAndCount(&resp.List) + resp.TotalCount, err = session.Limit(req.GetPageSize(), (req.GetPage()-1)*req.GetPageSize()). + OrderBy("r.created_at desc"). + FindAndCount(&resp.List) for i := 0; i < len(resp.List); i++ { _ = json.Unmarshal([]byte(resp.List[i].AlertRules.AlertCondition), &resp.List[i].AlertCondition) _ = json.Unmarshal([]byte(resp.List[i].AlertRules.AlertRange), &resp.List[i].AlertRange)