From 0847d930c1b2e284cf6bc8846aa200296652228c Mon Sep 17 00:00:00 2001
From: chy <2463300564@qq.com>
Date: Tue, 8 Jul 2025 20:39:56 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E9=97=A8=E5=BA=97=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E6=8E=92=E8=A1=8C=E6=A6=9C=20bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 internal/logic/task/task.go | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/internal/logic/task/task.go b/internal/logic/task/task.go
index fba0fcf..7488fd8 100644
--- a/internal/logic/task/task.go
+++ b/internal/logic/task/task.go
@@ -80,9 +80,10 @@ func (s *sTask) UserTaskRankingList(ctx context.Context, in *model.UserTaskRanki
 	if in.Size == 0 {
 		in.Size = 10
 	}
-
+	var storeId int
 	if in.StoreId > 0 {
 		m = m.Where(dao.UserTasks.Columns().StoreId, in.StoreId)
+		storeId = in.StoreId
 	} else if in.NetBarAccount != "" && in.StoreId <= 0 {
 		value, err := dao.Stores.Ctx(ctx).Where(dao.Stores.Columns().NetbarAccount, in.NetBarAccount).Fields(dao.Stores.Columns().Id).Value()
 		if err != nil {
@@ -91,9 +92,8 @@ func (s *sTask) UserTaskRankingList(ctx context.Context, in *model.UserTaskRanki
 		if value.IsEmpty() {
 			return nil, ecode.Fail.Sub("门店不存在")
 		}
-
-		m = m.Where(dao.UserTasks.Columns().StoreId, value.Int())
-
+		storeId = value.Int()
+		m = m.Where(dao.UserTasks.Columns().StoreId, storeId)
 	}
 
 	list := make([]model.UserTaskRankingArgs, 0)
@@ -112,7 +112,7 @@ func (s *sTask) UserTaskRankingList(ctx context.Context, in *model.UserTaskRanki
 	var loginUserRanking []model.LoginUserRanking
 	var loginUserRankingNum model.LoginUserRankingNum
 	if in.OperatorId != 0 {
-		value, err := dao.UserTasks.Ctx(ctx).Fields("count(*) num").Where(dao.UserTasks.Columns().UserId, in.OperatorId).Where(dao.UserTasks.Columns().StoreId, in.StoreId).Where(dao.UserTasks.Columns().Status, 2).
+		value, err := dao.UserTasks.Ctx(ctx).Fields("count(*) num").Where(dao.UserTasks.Columns().UserId, in.OperatorId).Where(dao.UserTasks.Columns().StoreId, storeId).Where(dao.UserTasks.Columns().Status, 2).
 			WhereBetween(dao.UserTasks.Columns().CompletedAt, start, end).Group("user_id").
 			Value()
 
@@ -127,7 +127,7 @@ func (s *sTask) UserTaskRankingList(ctx context.Context, in *model.UserTaskRanki
 		}
 
 		err = dao.UserTasks.Ctx(ctx).LeftJoin(dao.Users.Table(), fmt.Sprintf("`%s`.`id` = `%s`.`user_id`", dao.Users.Table(), dao.UserTasks.Table())).
-			Fields("username,count(*) num").Where(dao.UserTasks.Columns().StoreId, in.StoreId).Where(dao.UserTasks.Columns().Status, 2).
+			Fields("username,count(*) num").Where(dao.UserTasks.Columns().StoreId, storeId).Where(dao.UserTasks.Columns().Status, 2).
 			WhereBetween(dao.UserTasks.Columns().CompletedAt, start, end).OrderDesc("num").OrderDesc("username").Group("user_id").
 			Scan(&loginUserRanking)