llvy.ltd/casdoor
1
0
Fork 0
mirror of https://github.com/casdoor/casdoor.git synced 2025-05-23 02:35:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: change the id to key in syncer (#2263)

Browse Source
This commit is contained in:
Baihhh 2023-08-27 20:57:27 +08:00 committed by GitHub
parent fc3866db1c
commit b19be2df88
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
object/syncer_sync.go
View File

@ -27,7 +27,7 @@ func (syncer *Syncer) syncUsers() error {
fmt.Printf("Running syncUsers()..\n") fmt.Printf("Running syncUsers()..\n")
users, _, _ := syncer.getUserMap() users, _, _ := syncer.getUserMap()
oUsers, oUserMap, err := syncer.getOriginalUserMap() oUsers, _, err := syncer.getOriginalUserMap()
if err != nil { if err != nil {
fmt.Printf(err.Error()) fmt.Printf(err.Error())
@ -53,6 +53,11 @@ func (syncer *Syncer) syncUsers() error {
myUsers[syncer.getUserValue(m, key)] = m myUsers[syncer.getUserValue(m, key)] = m
} }
myOUsers := map[string]*User{}
for _, m := range oUsers {
myOUsers[syncer.getUserValue(m, key)] = m
}
newUsers := []*User{} newUsers := []*User{}
for _, oUser := range oUsers { for _, oUser := range oUsers {
primary := syncer.getUserValue(oUser, key) primary := syncer.getUserValue(oUser, key)
@ -124,8 +129,8 @@ func (syncer *Syncer) syncUsers() error {
if !syncer.IsReadOnly { if !syncer.IsReadOnly {
for _, user := range users { for _, user := range users {
id := user.Id primary := syncer.getUserValue(user, key)
if _, ok := oUserMap[id]; !ok { if _, ok := myOUsers[primary]; !ok {
newOUser := syncer.createOriginalUserFromUser(user) newOUser := syncer.createOriginalUserFromUser(user)
fmt.Printf("New oUser: %v\n", newOUser) fmt.Printf("New oUser: %v\n", newOUser)