From 7efe94590c6309f92f401f165fc36df2f4c71dd0 Mon Sep 17 00:00:00 2001 From: zouap Date: Mon, 5 Sep 2022 17:42:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- models/user_invitation.go | 1 + routers/user/Invitation.go | 7 ++----- 2 files changed, 3 insertions(+), 5 deletions(-) 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