From f99e105ae6dcea9dc6f284260f0692556bbbd0af Mon Sep 17 00:00:00 2001 From: Qu Xuan Date: Mon, 27 Sep 2021 17:09:44 +0800 Subject: [PATCH] fix(region): support query for project domain statistic --- pkg/cloudcommon/db/virtualresource.go | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkg/cloudcommon/db/virtualresource.go b/pkg/cloudcommon/db/virtualresource.go index 55a578da3b..b009ff17cb 100644 --- a/pkg/cloudcommon/db/virtualresource.go +++ b/pkg/cloudcommon/db/virtualresource.go @@ -142,7 +142,12 @@ func (manager *SVirtualResourceBaseManager) GetPropertyProjectStatistics(ctx con tenants := TenantCacheManager.GetTenantQuery().Equals("domain_id", userCred.GetProjectDomainId()).SubQuery() - sq := im.Query().SubQuery() + _q, err := ListItemQueryFilters(im, ctx, im.Query(), userCred, query, policy.PolicyActionList) + if err != nil { + return nil, err + } + + sq := _q.SubQuery() q := sq.Query( sq.Field("tenant_id"), @@ -170,7 +175,12 @@ func (manager *SVirtualResourceBaseManager) GetPropertyDomainStatistics(ctx cont domains := TenantCacheManager.GetDomainQuery().SubQuery() - sq := im.Query().SubQuery() + _q, err := ListItemQueryFilters(im, ctx, im.Query(), userCred, query, policy.PolicyActionList) + if err != nil { + return nil, err + } + + sq := _q.SubQuery() q := sq.Query( sq.Field("domain_id"),