From d9314af0474e45c810b4883d2ca81d1edafc43a0 Mon Sep 17 00:00:00 2001 From: denghui <1016848185@qq.com> Date: Tue, 8 Jul 2025 19:25:30 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=9C=AA=E7=BB=91=E5=AE=9A?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=E5=A5=96?= =?UTF-8?q?=E5=8A=B1=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/logic/task/task.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/logic/task/task.go b/internal/logic/task/task.go index 6fb8f1a..fba0fcf 100644 --- a/internal/logic/task/task.go +++ b/internal/logic/task/task.go @@ -573,7 +573,7 @@ func (s *sTask) GetTaskList(ctx context.Context, in *model.GetTaskListV2In) (out if err != nil { return nil, ecode.Fail.Sub("解析任务信息失败") } - if err = dao.TaskRewards.Ctx(ctx).Where(do.TaskRewards{TaskId: v.TaskId, StoreId: in.StoreId, NetbarAccount: in.NetBarAccount}).OmitEmptyWhere(). + if err = dao.TaskRewards.Ctx(ctx).Where(do.TaskRewards{TaskId: v.TaskId}).WhereOr(do.TaskRewards{TaskId: v.TaskId, NetbarAccount: in.NetBarAccount}). LeftJoin(dao.Rewards.Table(), "rewards.id = task_rewards.reward_id").Fields("rewards.*").Scan(&tasks[i].GameTask.Rewards); err != nil { return nil, ecode.Fail.Sub("获取任务奖励列表失败")