From eded468450c3428fec42960009f9c094b8bdbc5a Mon Sep 17 00:00:00 2001
From: zhora <zhora@zh-games.com>
Date: Fri, 24 Oct 2025 16:25:30 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=87=E6=BB=A4=E5=B7=B2=E5=AE=8C=E6=88=90?=
 =?UTF-8?q?=E4=B8=94=E6=9C=89=E5=90=8E=E7=BD=AE=E7=8A=B6=E6=80=81=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/web/handler/activity.go | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/modules/web/handler/activity.go b/modules/web/handler/activity.go
index 0a33ed9..01b6acc 100644
--- a/modules/web/handler/activity.go
+++ b/modules/web/handler/activity.go
@@ -27,11 +27,15 @@ func GetUserTaskStatus(a *app.Gin) (ret []*values.OneTask) {
 	taskCfgs := call.GetConfigTask()
 	taskMap := make(map[int]*common.ConfigTaskStr) // 任务列表
 	userTaskMap := make(map[int]*common.TaskData)
+	preTask := make(map[int]struct{})
 	var update bool
 	for _, v := range taskCfgs {
 		taskMap[v.TaskID] = &common.ConfigTaskStr{
 			ConfigTask: v,
 		}
+		if v.PreTaskId > 0 {
+			preTask[v.PreTaskId] = struct{}{}
+		}
 	}
 	for _, v := range userTask {
 		if _, ok := taskMap[v.TaskID]; !ok { // 不存在则删除
@@ -96,6 +100,9 @@ func GetUserTaskStatus(a *app.Gin) (ret []*values.OneTask) {
 		if taskMap[v.TaskID].PreTaskId > 0 && userTaskMap[taskMap[v.TaskID].PreTaskId].TaskStatus != 2 {
 			continue
 		}
+		if _, ok := preTask[v.TaskID]; ok && v.TaskStatus == 2 {
+			continue
+		}
 		oneTask := &values.OneTask{
 			TaskID:   v.TaskID,
 			Progress: int64(v.TaskValue),