From 439cf1948eb3714ee0459cc315453abceecf3ca3 Mon Sep 17 00:00:00 2001 From: Qu Xuan Date: Tue, 28 Jul 2020 17:53:06 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=99=AE=E9=80=9A=E8=A7=86=E5=9B=BE?= =?UTF-8?q?=E4=B8=8B=EF=BC=8C=E5=AE=89=E5=85=A8=E7=BB=84=E4=BB=85=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E5=8F=AF=E7=9C=8B=E5=88=B0=E7=9A=84vm=20count?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/compute/models/secgroups.go | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkg/compute/models/secgroups.go b/pkg/compute/models/secgroups.go index 3ba306229b..46edd85a6c 100644 --- a/pkg/compute/models/secgroups.go +++ b/pkg/compute/models/secgroups.go @@ -312,6 +312,14 @@ func (manager *SSecurityGroupManager) FetchCustomizeColumns( sqlchemy.In(q.Field("secgrp_id"), secgroupIds), sqlchemy.In(q.Field("admin_secgrp_id"), secgroupIds), )) + + ownerId, queryScope, err := db.FetchCheckQueryOwnerScope(ctx, userCred, query, GuestManager, policy.PolicyActionList, true) + if err != nil { + log.Errorf("FetchCheckQueryOwnerScope error: %v", err) + return rows + } + + q = GuestManager.FilterByOwner(q, ownerId, queryScope) err = db.FetchModelObjects(GuestManager, q, &guests) if err != nil { log.Errorf("db.FetchModelObjects error: %v", err) @@ -341,8 +349,11 @@ func (manager *SSecurityGroupManager) FetchCustomizeColumns( } } + sq := GuestManager.Query("id") + sq = GuestManager.FilterByOwner(sq, ownerId, queryScope) + guestSecgroups := []SGuestsecgroup{} - q = GuestsecgroupManager.Query().In("secgroup_id", secgroupIds) + q = GuestsecgroupManager.Query().In("secgroup_id", secgroupIds).In("guest_id", sq.SubQuery()) err = db.FetchModelObjects(GuestsecgroupManager, q, &guestSecgroups) if err != nil { log.Errorf("db.FetchModelObjects error: %v", err)