fix(keystone): fetch domain user count (#23590)

This commit is contained in:
屈轩
2025-10-22 16:25:40 +08:00
committed by GitHub
parent 8abcde01e8
commit 1d361bb4d3
2 changed files with 9 additions and 1 deletions
+8
View File
@@ -27,6 +27,7 @@ import (
"yunion.io/x/pkg/tristate"
"yunion.io/x/pkg/util/rbacscope"
"yunion.io/x/pkg/util/timeutils"
"yunion.io/x/pkg/utils"
"yunion.io/x/sqlchemy"
api "yunion.io/x/onecloud/pkg/apis/identity"
@@ -394,6 +395,13 @@ type SDomainUsageCount struct {
func (m *SDomainManager) query(manager db.IModelManager, field string, domainIds []string, filter func(*sqlchemy.SQuery) *sqlchemy.SQuery) *sqlchemy.SSubQuery {
q := manager.Query()
if utils.IsInStringArray(manager.Keyword(), []string{
GroupManager.Keyword(),
UserManager.Keyword(),
ProjectManager.Keyword(),
}) {
q = q.IsFalse("pending_deleted")
}
if filter != nil {
q = filter(q)