diff --git a/pkg/apis/identity/input.go b/pkg/apis/identity/input.go index bd8c60b10b..914dbf35af 100644 --- a/pkg/apis/identity/input.go +++ b/pkg/apis/identity/input.go @@ -286,13 +286,13 @@ type IdentityProviderListInput struct { apis.EnabledStatusStandaloneResourceListInput // 以驱动类型过滤 - Driver string `json:"driver"` + Driver []string `json:"driver"` // 以模板过滤 - Template string `json:"template"` + Template []string `json:"template"` // 以同步状态过滤 - SyncStatus string `json:"sync_status"` + SyncStatus []string `json:"sync_status"` } type CredentialListInput struct { @@ -301,7 +301,7 @@ type CredentialListInput struct { UserFilterListInput ProjectFilterListInput - Type string `json:"type"` + Type []string `json:"type"` Enabled *bool `json:"enabled"` } @@ -311,7 +311,7 @@ type PolicyListInput struct { apis.SharableResourceBaseListInput // 以类型查询 - Type string `json:"type"` + Type []string `json:"type"` } type RegionFilterListInput struct { @@ -330,7 +330,7 @@ type ServiceListInput struct { apis.StandaloneResourceListInput // 以Service Type过滤 - Type string `json:"type"` + Type []string `json:"type"` // 是否启用/禁用 Enabled *bool `json:"enabled"` diff --git a/pkg/image/models/images.go b/pkg/image/models/images.go index c43e5b7ddd..c6da416125 100644 --- a/pkg/image/models/images.go +++ b/pkg/image/models/images.go @@ -1140,9 +1140,8 @@ func (manager *SImageManager) ListItemFilter( if err != nil { return nil, errors.Wrap(err, "SSharableVirtualResourceBaseManager.ListItemFilter") } - fmtJsonArray := query.DiskFormats - if len(fmtJsonArray) > 0 { - q = q.In("disk_format", fmtJsonArray) + if len(query.DiskFormats) > 0 { + q = q.In("disk_format", query.DiskFormats) } if query.Uefi != nil && *query.Uefi { imagePropertyQ := ImagePropertyManager.Query(). diff --git a/pkg/keystone/models/credentials.go b/pkg/keystone/models/credentials.go index 5ca3e3a05d..3321c40cb1 100644 --- a/pkg/keystone/models/credentials.go +++ b/pkg/keystone/models/credentials.go @@ -310,7 +310,7 @@ func (manager *SCredentialManager) ListItemFilter( } } if len(query.Type) > 0 { - q = q.Equals("type", query.Type) + q = q.In("type", query.Type) } return q, nil } diff --git a/pkg/keystone/models/identity_provider.go b/pkg/keystone/models/identity_provider.go index 02eae232ff..75e2f110e5 100644 --- a/pkg/keystone/models/identity_provider.go +++ b/pkg/keystone/models/identity_provider.go @@ -843,13 +843,13 @@ func (manager *SIdentityProviderManager) ListItemFilter( return nil, errors.Wrap(err, "SEnabledStatusStandaloneResourceBaseManager.ListItemFilter") } if len(query.Driver) > 0 { - q = q.Equals("driver", query.Driver) + q = q.In("driver", query.Driver) } if len(query.Template) > 0 { - q = q.Equals("template", query.Template) + q = q.In("template", query.Template) } if len(query.SyncStatus) > 0 { - q = q.Equals("sync_status", query.SyncStatus) + q = q.In("sync_status", query.SyncStatus) } return q, nil } diff --git a/pkg/keystone/models/policies.go b/pkg/keystone/models/policies.go index 413b27e625..68802c69e8 100644 --- a/pkg/keystone/models/policies.go +++ b/pkg/keystone/models/policies.go @@ -223,7 +223,7 @@ func (manager *SPolicyManager) ListItemFilter( return nil, errors.Wrap(err, "SSharableBaseResourceManager.ListItemFilter") } if len(query.Type) > 0 { - q = q.Equals("type", query.Type) + q = q.In("type", query.Type) } return q, nil } diff --git a/pkg/keystone/models/services.go b/pkg/keystone/models/services.go index 62daf0e132..14c701f072 100644 --- a/pkg/keystone/models/services.go +++ b/pkg/keystone/models/services.go @@ -233,7 +233,7 @@ func (manager *SServiceManager) ListItemFilter( return nil, errors.Wrap(err, "SStandaloneResourceBaseManager.ListItemFilter") } if len(query.Type) > 0 { - q = q.Equals("type", query.Type) + q = q.In("type", query.Type) } if query.Enabled != nil { if *query.Enabled {