From d5f88357452096c90b95aa1d359afe6174855748 Mon Sep 17 00:00:00 2001
From: Your Name <your.email@example.com>
Date: Fri, 23 Jan 2026 12:04:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E4=B8=80=E7=BA=A7?=
 =?UTF-8?q?=E9=9C=80=E6=B1=82=E4=BB=BB=E5=8A=A1=E7=9A=84=E5=8F=91=E5=B8=83?=
 =?UTF-8?q?=E4=BA=BA=E6=98=BE=E7=A4=BA=E6=98=8E=E7=BB=86=E5=AE=8C=E5=96=84?=
 =?UTF-8?q?=E4=BA=BA=EF=BC=8C=E6=98=8E=E7=BB=86=E5=AE=8C=E5=96=84=E4=BA=BA?=
 =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E6=92=A4=E5=9B=9E=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/designhub/mapper/TaskMapper.java    | 10 +++++++---
 .../main/java/com/designhub/service/TaskService.java  | 11 +++++++++--
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/backend/src/main/java/com/designhub/mapper/TaskMapper.java b/backend/src/main/java/com/designhub/mapper/TaskMapper.java
index 7df2fc9..afed9d7 100644
--- a/backend/src/main/java/com/designhub/mapper/TaskMapper.java
+++ b/backend/src/main/java/com/designhub/mapper/TaskMapper.java
@@ -186,17 +186,19 @@ public interface TaskMapper extends BaseMapper<Task> {
     /**
      * 查询我发布的任务
      * 包括：作为发布人的任务 或 作为一级需求任务明细完善人的任务
+     * 对于一级需求任务，publisherName 显示明细完善人
      */
     @Select("<script>" +
             "SELECT t.*, " +
             "       b.brand_name AS brandName, " +
             "       c.category_name AS categoryName, " +
             "       p.platform_name AS platformName, " +
-            "       u.real_name AS publisherName, " +
-            "       d.dept_name AS publisherDeptName, " +
+            "       CASE WHEN t.is_primary_task = 1 AND t.detail_completer_id IS NOT NULL THEN detail_user.real_name ELSE u.real_name END AS publisherName, " +
+            "       CASE WHEN t.is_primary_task = 1 AND t.detail_completer_id IS NOT NULL THEN detail_dept.dept_name ELSE d.dept_name END AS publisherDeptName, " +
             "       approver.real_name AS currentApproverName, " +
             "       primary_user.real_name AS primaryPublisherName, " +
-            "       primary_dept.dept_name AS primaryPublisherDeptName " +
+            "       primary_dept.dept_name AS primaryPublisherDeptName, " +
+            "       detail_user.real_name AS detailCompleterName " +
             "FROM task t " +
             "LEFT JOIN brand b ON t.brand_id = b.id " +
             "LEFT JOIN category c ON t.category_id = c.id " +
@@ -206,6 +208,8 @@ public interface TaskMapper extends BaseMapper<Task> {
             "LEFT JOIN sys_user approver ON t.current_approver_id = approver.id " +
             "LEFT JOIN sys_user primary_user ON t.primary_publisher_id = primary_user.id " +
             "LEFT JOIN sys_dept primary_dept ON t.primary_publisher_dept_id = primary_dept.id " +
+            "LEFT JOIN sys_user detail_user ON t.detail_completer_id = detail_user.id " +
+            "LEFT JOIN sys_dept detail_dept ON detail_user.dept_id = detail_dept.id " +
             "WHERE (t.publisher_id = #{userId} OR t.detail_completer_id = #{userId}) AND t.deleted = 0 " +
             "<if test='status != null'> AND t.status = #{status}</if> " +
             "ORDER BY t.update_time DESC" +
diff --git a/backend/src/main/java/com/designhub/service/TaskService.java b/backend/src/main/java/com/designhub/service/TaskService.java
index c3ce4c8..96792b5 100644
--- a/backend/src/main/java/com/designhub/service/TaskService.java
+++ b/backend/src/main/java/com/designhub/service/TaskService.java
@@ -2398,6 +2398,7 @@ public class TaskService {
     /**
      * 撤回任务（用于编辑后重新发布）
      * 只有任务发起人可以撤回，且任务必须未被抢单
+     * 对于一级需求任务，明细完善人也可以撤回
      */
     @Transactional(rollbackFor = Exception.class)
     public void withdrawTask(Long taskId, Long userId) {
@@ -2405,8 +2406,14 @@ public class TaskService {
         
         Task task = getTaskById(taskId);
         
-        // 验证权限（必须是任务发布人）
-        if (!userId.equals(task.getPublisherId())) {
+        // 验证权限：
+        // 1. 原始发布人可以撤回
+        // 2. 对于一级需求任务，明细完善人也可以撤回
+        boolean hasPermission = userId.equals(task.getPublisherId());
+        if (!hasPermission && task.getIsPrimaryTask() != null && task.getIsPrimaryTask() == 1) {
+            hasPermission = userId.equals(task.getDetailCompleterId());
+        }
+        if (!hasPermission) {
             throw new BusinessException(ResultCode.FORBIDDEN, "只有任务发布人可以撤回任务");
         }