Merge pull request #19851 from swordqiu/automated-cherry-pick-of-#19850-upstream-release-3.11

Automated cherry pick of #19850: fix: idp list query filter by sso_domain

pkg/apis/identity/input.go

@@ -337,7 +337,7 @@ type IdentityProviderListInput struct {
 
 	// 过滤支持SSO的认证源，如果值为all，则列出所有的全局认证源，否则可出sso为域ID的域认证源
 	// example: all
-	SsoDomain string `json:"sso"`
+	SsoDomain string `json:"sso_domain"`
 
 	AutoCreateProject *bool `json:"auto_create_project"`
 	AutoCreateUser    *bool `json:"auto_create_user"`

pkg/keystone/models/identity_provider.go

@@ -1163,7 +1163,10 @@ func (manager *SIdentityProviderManager) ListItemFilter(
 					return nil, errors.Wrap(err, "FetchDomainByIdOrName")
 				}
 			}
-			q = q.Equals("domain_id", ssoDomain.Id)
+			q = q.Filter(sqlchemy.OR(
+				sqlchemy.Equals(q.Field("domain_id"), ssoDomain.Id),
+				sqlchemy.IsNullOrEmpty(q.Field("domain_id")),
+			))
 		}
 	}
 	if query.AutoCreateProject != nil {