From 9e5408856f08d4e613e8071d8cf4bcef35d2914b Mon Sep 17 00:00:00 2001 From: Qu Xuan Date: Fri, 18 Jun 2021 14:19:23 +0800 Subject: [PATCH] fix(region): manager distinct field --- pkg/compute/models/cloudproviders.go | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkg/compute/models/cloudproviders.go b/pkg/compute/models/cloudproviders.go index 2a11d218bb..53f2c34da7 100644 --- a/pkg/compute/models/cloudproviders.go +++ b/pkg/compute/models/cloudproviders.go @@ -1310,6 +1310,13 @@ func (manager *SCloudproviderManager) QueryDistinctExtraField(q *sqlchemy.SQuery return q, nil } + if field == "account" { + accounts := CloudaccountManager.Query("name", "id").SubQuery() + q.AppendField(accounts.Field("name", field)).Distinct() + q = q.Join(accounts, sqlchemy.Equals(q.Field("cloudaccount_id"), accounts.Field("id"))) + return q, nil + } + q, err = manager.SEnabledStatusStandaloneResourceBaseManager.QueryDistinctExtraField(q, field) if err == nil { return q, nil