From e1c921cf2599245de95b0a6dfd63a40bf6ab140b Mon Sep 17 00:00:00 2001 From: wanyaoqi Date: Wed, 14 Aug 2019 20:41:37 +0800 Subject: [PATCH] add distinct field manager --- pkg/compute/models/vpcs.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkg/compute/models/vpcs.go b/pkg/compute/models/vpcs.go index ef1f3b6e58..05a26f9b34 100644 --- a/pkg/compute/models/vpcs.go +++ b/pkg/compute/models/vpcs.go @@ -683,6 +683,11 @@ func (manager *SVpcManager) QueryDistinctExtraField(q *sqlchemy.SQuery, field st q = q.Join(cloudaccounts, sqlchemy.Equals(cloudproviders.Field("cloudaccount_id"), cloudaccounts.Field("id"))) q.GroupBy(cloudaccounts.Field("name")) q.AppendField(cloudaccounts.Field("name", "account")) + case "manager": + cloudproviders := CloudproviderManager.Query("name", "id").Distinct().SubQuery() + q = q.Join(cloudproviders, sqlchemy.Equals(q.Field("manager_id"), cloudproviders.Field("id"))) + q.GroupBy(cloudproviders.Field("name")) + q.AppendField(cloudproviders.Field("name", "manager")) default: return nil, httperrors.NewBadRequestError("unsupport field %s", field) }