diff --git a/pkg/apis/identity/input.go b/pkg/apis/identity/input.go index 4f75a46ce8..62bf2d15c5 100644 --- a/pkg/apis/identity/input.go +++ b/pkg/apis/identity/input.go @@ -199,11 +199,11 @@ type UserListInput struct { RoleAssignmentProjectId string `json:"role_assignment_project_id"` // email - Email string `json:"email"` + Email []string `json:"email"` // mobile - Mobile string `json:"mobile"` + Mobile []string `json:"mobile"` // displayname - Displayname string `json:"displayname"` + Displayname []string `json:"displayname"` // 是否允许web控制台登录 AllowWebConsole *bool `json:"allow_web_console"` diff --git a/pkg/cloudcommon/options/mergeconf.go b/pkg/cloudcommon/options/mergeconf.go index 122b160cf1..067ef90972 100644 --- a/pkg/cloudcommon/options/mergeconf.go +++ b/pkg/cloudcommon/options/mergeconf.go @@ -31,7 +31,7 @@ import ( func GetServiceIdByType(s *mcclient.ClientSession, typeStr string, verStr string) (string, error) { params := jsonutils.NewDict() - if len(verStr) > 0 { + if len(verStr) > 0 && verStr != "v1" { typeStr += "_" + verStr } params.Add(jsonutils.NewString(typeStr), "type") diff --git a/pkg/keystone/models/users.go b/pkg/keystone/models/users.go index 6e578c6e1a..2d3626ec13 100644 --- a/pkg/keystone/models/users.go +++ b/pkg/keystone/models/users.go @@ -440,13 +440,13 @@ func (manager *SUserManager) ListItemFilter( } if len(query.Email) > 0 { - q = q.Equals("email", query.Email) + q = q.In("email", query.Email) } if len(query.Mobile) > 0 { - q = q.Equals("mobile", query.Mobile) + q = q.In("mobile", query.Mobile) } if len(query.Displayname) > 0 { - q = q.Equals("displayname", query.Displayname) + q = q.In("displayname", query.Displayname) } if query.AllowWebConsole != nil { if *query.AllowWebConsole {