diff --git a/models/user_invitation.go b/models/user_invitation.go index 43805a159..4831e27da 100644 --- a/models/user_invitation.go +++ b/models/user_invitation.go @@ -14,6 +14,7 @@ type Invitation struct { UserID int64 `xorm:"NOT NULL DEFAULT 0"` Phone string `xorm:"INDEX"` Avatar string `xorm:"-"` + Name string `xorm:"-"` IsActive bool `xorm:"-"` CreatedUnix timeutil.TimeStamp `xorm:"created"` } diff --git a/routers/user/Invitation.go b/routers/user/Invitation.go index 1c57cb406..0fa8cd4ed 100644 --- a/routers/user/Invitation.go +++ b/routers/user/Invitation.go @@ -47,12 +47,9 @@ func GetInvitaionCode(ctx *context.Context) { for _, record := range re { tmpUser, err := models.GetUserByID(record.UserID) if err == nil { - if tmpUser.Avatar != "" { - record.Avatar = tmpUser.Avatar - } else { - record.Avatar = strings.TrimRight(setting.AppSubURL, "/") + "/user/avatar/" + tmpUser.Name + "/" + strconv.Itoa(-1) - } + record.Avatar = strings.TrimRight(setting.AppSubURL, "/") + "/user/avatar/" + tmpUser.Name + "/" + strconv.Itoa(-1) record.IsActive = tmpUser.IsActive + record.Name = tmpUser.Name } } resultJsonMap["invitation_users"] = re