diff --git a/object/ldap_conn.go b/object/ldap_conn.go index 01f049f0..bc9f716d 100644 --- a/object/ldap_conn.go +++ b/object/ldap_conn.go @@ -305,7 +305,7 @@ func SyncLdapUsers(owner string, syncUsers []LdapUser, ldapId string) (existUser return nil, nil, err } - name, err := syncUser.buildLdapUserName() + name, err := syncUser.buildLdapUserName(owner) if err != nil { return nil, nil, err } @@ -354,10 +354,10 @@ func GetExistUuids(owner string, uuids []string) ([]string, error) { return existUuids, nil } -func (ldapUser *LdapUser) buildLdapUserName() (string, error) { +func (ldapUser *LdapUser) buildLdapUserName(owner string) (string, error) { user := User{} uidWithNumber := fmt.Sprintf("%s_%s", ldapUser.Uid, ldapUser.UidNumber) - has, err := ormer.Engine.Where("name = ? or name = ?", ldapUser.Uid, uidWithNumber).Get(&user) + has, err := ormer.Engine.Where("owner = ? and (name = ? or name = ?)", owner, ldapUser.Uid, uidWithNumber).Get(&user) if err != nil { return "", err }