llvy.ltd/casdoor
1
0
Fork 0
mirror of https://github.com/casdoor/casdoor.git synced 2025-07-03 12:30:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix affiliationMap null bug.

Browse Source
This commit is contained in:
Yang Luo
2021-12-22 21:09:13 +08:00
parent b95f107a60
commit 8dcb56ea71
2 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
object/syncer_sync.go
View File

@ -23,7 +23,10 @@ func (syncer *Syncer) syncUsers() {
oUsers, oUserMap := syncer.getOriginalUserMap() oUsers, oUserMap := syncer.getOriginalUserMap()
fmt.Printf("Users: %d, oUsers: %d\n", len(users), len(oUsers)) fmt.Printf("Users: %d, oUsers: %d\n", len(users), len(oUsers))
_, affiliationMap := syncer.getAffiliationMap() var affiliationMap map[int]string
if syncer.AffiliationTable != "" {
_, affiliationMap = syncer.getAffiliationMap()
}
newUsers := []*User{} newUsers := []*User{}
for _, oUser := range oUsers { for _, oUser := range oUsers {

9
object/syncer_util.go
View File

@ -43,16 +43,22 @@ func (syncer *Syncer) getPartialAvatarUrl(avatar string) string {
func (syncer *Syncer) createUserFromOriginalUser(originalUser *OriginalUser, affiliationMap map[int]string) *User { func (syncer *Syncer) createUserFromOriginalUser(originalUser *OriginalUser, affiliationMap map[int]string) *User {
user := *originalUser user := *originalUser
user.Owner = syncer.Organization user.Owner = syncer.Organization
if user.Name == "" { if user.Name == "" {
user.Name = originalUser.Id user.Name = originalUser.Id
} }
if user.CreatedTime == "" { if user.CreatedTime == "" {
user.CreatedTime = util.GetCurrentTime() user.CreatedTime = util.GetCurrentTime()
} }
if user.Type == "" { if user.Type == "" {
user.Type = "normal-user" user.Type = "normal-user"
} }
user.Avatar = syncer.getFullAvatarUrl(user.Avatar) user.Avatar = syncer.getFullAvatarUrl(user.Avatar)
if affiliationMap != nil {
if originalUser.Score != 0 { if originalUser.Score != 0 {
affiliation, ok := affiliationMap[originalUser.Score] affiliation, ok := affiliationMap[originalUser.Score]
if !ok { if !ok {
@ -60,9 +66,12 @@ func (syncer *Syncer) createUserFromOriginalUser(originalUser *OriginalUser, aff
} }
user.Affiliation = affiliation user.Affiliation = affiliation
} }
}
if user.Properties == nil { if user.Properties == nil {
user.Properties = map[string]string{} user.Properties = map[string]string{}
} }
return &user return &user
} }