From 18d36c8264fd3a6bc0b9b82d9d73afecccc07f90 Mon Sep 17 00:00:00 2001
From: Your Name <your.email@example.com>
Date: Mon, 26 Jan 2026 18:15:53 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=B7=B2=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=E5=AE=A1=E6=A0=B8=E4=BD=86status=E4=BB=8D=E4=B8=BAdra?=
 =?UTF-8?q?ft=E7=9A=84=E4=BB=BB=E5=8A=A1=E4=B8=8D=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修改 getMyPublishedTasks 查询逻辑
- 如果 approval_status 存在且不是 draft，即使 status 是 draft 也显示
---
 .../main/java/com/designhub/service/TaskService.java  | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/backend/src/main/java/com/designhub/service/TaskService.java b/backend/src/main/java/com/designhub/service/TaskService.java
index 33f305a..2a43e03 100644
--- a/backend/src/main/java/com/designhub/service/TaskService.java
+++ b/backend/src/main/java/com/designhub/service/TaskService.java
@@ -1348,7 +1348,16 @@ public class TaskService {
         if (StringUtils.hasText(status)) {
             wrapper.eq(Task::getStatus, status);
         } else {
-            wrapper.ne(Task::getStatus, "draft"); // 排除草稿
+            // 排除纯草稿（但保留已进入审批流程的任务）
+            // 如果 approval_status 存在且不是 draft，说明任务已进入审批流程，即使 status 是 draft 也应该显示
+            wrapper.and(w -> w
+                .ne(Task::getStatus, "draft")
+                .or(ow -> ow
+                    .isNotNull(Task::getApprovalStatus)
+                    .ne(Task::getApprovalStatus, "draft")
+                    .ne(Task::getApprovalStatus, "")
+                )
+            );
         }
         
         // 任务类型筛选