From 0fdab009e448f731c232e79a593e60341fc83fdd Mon Sep 17 00:00:00 2001
From: huangjiajun <582604932@qq.com>
Date: Mon, 22 Sep 2025 10:34:28 +0800
Subject: [PATCH] 1

---
 app/operator/svc/svc_task.go | 2 +-
 app/store/svc/svc_task.go    | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/operator/svc/svc_task.go b/app/operator/svc/svc_task.go
index 2930218..d5beed2 100644
--- a/app/operator/svc/svc_task.go
+++ b/app/operator/svc/svc_task.go
@@ -47,7 +47,7 @@ func TaskDown(c *gin.Context) {
 		return
 	}
 	user := svc.GetUser(c)
-	update, _ := svc.MasterDb(c).Where("task_id=? and uid=?", args["id"], user.Info.Uid).Delete(&models.CampTaskOperatorTask{})
+	update, _ := svc.MasterDb(c).Where("id=? and uid=?", args["id"], user.Info.Uid).Delete(&models.CampTaskOperatorTask{})
 	if update == 0 {
 		e.OutErr(c, 400, e.NewErr(400, "下架失败"))
 		return
diff --git a/app/store/svc/svc_task.go b/app/store/svc/svc_task.go
index 8e52046..bd34f68 100644
--- a/app/store/svc/svc_task.go
+++ b/app/store/svc/svc_task.go
@@ -30,7 +30,10 @@ func TaskList(c *gin.Context) {
 	if store.Pid > 0 {
 		contact = append(contact, utils.IntToStr(store.Id))
 	}
-	sess := svc.MasterDb(c).Where("store_id=? and is_delete=0", storeId).In("contact", contact)
+	sess := svc.MasterDb(c).Where("store_id=? and is_delete=0", storeId)
+	if store.Pid > 0 {
+		sess.In("contact", contact)
+	}
 	if args.TaskType != "" {
 		sess.And("first_cid=?", args.TaskType)
 	}