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("获取任务奖励列表失败")