diff --git a/pkg/apis/compute/secgroup.go b/pkg/apis/compute/secgroup.go index df2ef7a599..a788b8ceb3 100644 --- a/pkg/apis/compute/secgroup.go +++ b/pkg/apis/compute/secgroup.go @@ -237,13 +237,13 @@ type SecgroupDetails struct { apis.SharableVirtualResourceDetails SSecurityGroup - // 关联云主机数量 + // 关联云主机数量, 不包含回收站云主机 GuestCnt int `json:"guest_cnt,allowempty"` - // 关联此安全组的云主机is_system为true数量 + // 关联此安全组的云主机is_system为true数量, , 不包含回收站云主机 SystemGuestCnt int `json:"system_guest_cnt,allowempty"` - // admin_secgrp_id为此安全组的云主机数量 + // admin_secgrp_id为此安全组的云主机数量, , 不包含回收站云主机 AdminGuestCnt int `json:"admin_guest_cnt,allowempty"` // 安全组缓存数量 diff --git a/pkg/compute/models/secgroups.go b/pkg/compute/models/secgroups.go index b05bba77ef..1c97c426f2 100644 --- a/pkg/compute/models/secgroups.go +++ b/pkg/compute/models/secgroups.go @@ -408,7 +408,7 @@ func (manager *SSecurityGroupManager) FetchCustomizeColumns( } guests := []SGuest{} - q = GuestManager.Query() + q = GuestManager.Query().IsFalse("pending_deleted") q = q.Filter(sqlchemy.OR( sqlchemy.In(q.Field("secgrp_id"), secgroupIds), sqlchemy.In(q.Field("admin_secgrp_id"), secgroupIds), @@ -450,7 +450,7 @@ func (manager *SSecurityGroupManager) FetchCustomizeColumns( } } - sq := GuestManager.Query("id") + sq := GuestManager.Query("id").IsFalse("pending_deleted") sq = GuestManager.FilterByOwner(sq, ownerId, queryScope) guestSecgroups := []SGuestsecgroup{}