From 8dcb56ea71083a5a7cc887d5a899248ef1a3165f Mon Sep 17 00:00:00 2001
From: Yang Luo <hsluoyz@qq.com>
Date: Wed, 22 Dec 2021 21:09:13 +0800
Subject: [PATCH] Fix affiliationMap null bug.

---
 object/syncer_sync.go |  5 ++++-
 object/syncer_util.go | 19 ++++++++++++++-----
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/object/syncer_sync.go b/object/syncer_sync.go
index 49fab590..a628cdae 100644
--- a/object/syncer_sync.go
+++ b/object/syncer_sync.go
@@ -23,7 +23,10 @@ func (syncer *Syncer) syncUsers() {
 	oUsers, oUserMap := syncer.getOriginalUserMap()
 	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{}
 	for _, oUser := range oUsers {
diff --git a/object/syncer_util.go b/object/syncer_util.go
index 1df1e842..fa7912d9 100644
--- a/object/syncer_util.go
+++ b/object/syncer_util.go
@@ -43,26 +43,35 @@ func (syncer *Syncer) getPartialAvatarUrl(avatar string) string {
 func (syncer *Syncer) createUserFromOriginalUser(originalUser *OriginalUser, affiliationMap map[int]string) *User {
 	user := *originalUser
 	user.Owner = syncer.Organization
+
 	if user.Name == "" {
 		user.Name = originalUser.Id
 	}
+
 	if user.CreatedTime == "" {
 		user.CreatedTime = util.GetCurrentTime()
 	}
+
 	if user.Type == "" {
 		user.Type = "normal-user"
 	}
+
 	user.Avatar = syncer.getFullAvatarUrl(user.Avatar)
-	if originalUser.Score != 0 {
-		affiliation, ok := affiliationMap[originalUser.Score]
-		if !ok {
-			panic(fmt.Sprintf("Affiliation not found: %d", originalUser.Score))
+
+	if affiliationMap != nil {
+		if originalUser.Score != 0 {
+			affiliation, ok := affiliationMap[originalUser.Score]
+			if !ok {
+				panic(fmt.Sprintf("Affiliation not found: %d", originalUser.Score))
+			}
+			user.Affiliation = affiliation
 		}
-		user.Affiliation = affiliation
 	}
+
 	if user.Properties == nil {
 		user.Properties = map[string]string{}
 	}
+
 	return &user
 }