From c412b6ac35a7d92607b92741f363876f4b5ca2e9 Mon Sep 17 00:00:00 2001 From: chenyifan01 Date: Wed, 28 Sep 2022 14:23:53 +0800 Subject: [PATCH] #2967 fix bug --- models/reward_operate_record.go | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/models/reward_operate_record.go b/models/reward_operate_record.go index da1b6a589..f201be646 100644 --- a/models/reward_operate_record.go +++ b/models/reward_operate_record.go @@ -3,6 +3,7 @@ package models import ( "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/timeutil" + "fmt" "strconv" "strings" "xorm.io/builder" @@ -130,21 +131,27 @@ func (l RewardRecordShowList) loadAction() error { return nil } actionIds := make([]int64, 0) - actionIdMap := make(map[int64]*RewardOperateRecordShow, 0) for _, r := range l { if r.SourceType != SourceTypeAccomplishTask.Name() { continue } i, _ := strconv.ParseInt(r.SourceId, 10, 64) actionIds = append(actionIds, i) - actionIdMap[i] = r } actions, err := GetActionByIds(actionIds) if err != nil { return err } + actionIdMap := make(map[string]*Action, 0) for _, v := range actions { - actionIdMap[v.ID].Action = v.ToShow() + actionIdMap[fmt.Sprint(v.ID)] = v + } + + for i, r := range l { + act := actionIdMap[r.SourceId] + if act != nil { + l[i].Action = act.ToShow() + } } return nil }