From 032750b0e8b5c543333781261544541fc66ec1d1 Mon Sep 17 00:00:00 2001
From: zhaoxiangchun <1422928955@qq.com>
Date: Sat, 15 Jan 2022 10:24:17 +0800
Subject: [PATCH] fix(common): ListItemFilter func exec in the end
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1.ListItemFilter 中如果有group by 操作(meter服务),如果使用框架解析filter参数，
会把filter 解析加入到 having结构中。
---
 pkg/cloudcommon/db/db_dispatcher.go | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkg/cloudcommon/db/db_dispatcher.go b/pkg/cloudcommon/db/db_dispatcher.go
index b24477013e..1ac6f67823 100644
--- a/pkg/cloudcommon/db/db_dispatcher.go
+++ b/pkg/cloudcommon/db/db_dispatcher.go
@@ -264,10 +264,6 @@ func listItemQueryFiltersRaw(manager IModelManager,
 		q = manager.FilterBySystemAttributes(q, userCred, query, queryScope)
 		q = manager.FilterByHiddenSystemAttributes(q, userCred, query, queryScope)
 	}
-	q, err = ListItemFilter(manager, ctx, q, userCred, query)
-	if err != nil {
-		return nil, err
-	}
 	if query.Contains("export_keys") {
 		exportKeys, _ := query.GetString("export_keys")
 		keys := stringutils2.NewSortedStrings(strings.Split(exportKeys, ","))
@@ -305,6 +301,10 @@ func listItemQueryFiltersRaw(manager IModelManager,
 			return nil, err
 		}
 	}
+	q, err = ListItemFilter(manager, ctx, q, userCred, query)
+	if err != nil {
+		return nil, err
+	}
 	return q, nil
 }