From 562f3ea93728371e855cef7bc5a367fadcbde38f Mon Sep 17 00:00:00 2001 From: UlricQin Date: Sun, 18 Jul 2021 16:39:10 +0800 Subject: [PATCH] code refactor --- models/alert_event.go | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/models/alert_event.go b/models/alert_event.go index 9be949ab..ee66aa63 100644 --- a/models/alert_event.go +++ b/models/alert_event.go @@ -185,7 +185,11 @@ func AlertEventTotal(stime, etime int64, query string, status, priority int) (nu arr := strings.Fields(query) for i := 0; i < len(arr); i++ { qarg := "%" + arr[i] + "%" - cond = cond.Or(builder.Like{"res_classpaths", qarg}, builder.Like{"rule_name", qarg}, builder.Like{"tags", qarg}) + innerCond := builder.NewCond() + innerCond = innerCond.Or(builder.Like{"res_classpaths", qarg}) + innerCond = innerCond.Or(builder.Like{"rule_name", qarg}) + innerCond = innerCond.Or(builder.Like{"tags", qarg}) + cond = cond.And(innerCond) } } @@ -216,7 +220,11 @@ func AlertEventGets(stime, etime int64, query string, status, priority int, limi arr := strings.Fields(query) for i := 0; i < len(arr); i++ { qarg := "%" + arr[i] + "%" - cond = cond.Or(builder.Like{"res_classpaths", qarg}, builder.Like{"rule_name", qarg}, builder.Like{"tags", qarg}) + innerCond := builder.NewCond() + innerCond = innerCond.Or(builder.Like{"res_classpaths", qarg}) + innerCond = innerCond.Or(builder.Like{"rule_name", qarg}) + innerCond = innerCond.Or(builder.Like{"tags", qarg}) + cond = cond.And(innerCond) } }