From 81d21aa0631d0b0ad1518c9d909a10af0550a849 Mon Sep 17 00:00:00 2001 From: Your Name Date: Fri, 23 Jan 2026 15:34:55 +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=E9=83=A8=E9=97=A8=E4=BB=BB=E5=8A=A1=E5=9C=A8?= =?UTF-8?q?=E8=8D=89=E7=A8=BF=E7=8A=B6=E6=80=81=E4=B8=8B=E4=B9=9F=E5=85=81?= =?UTF-8?q?=E8=AE=B8=E8=BD=AC=E6=8D=A2=E4=B8=BA=E6=B5=81=E6=B0=B4=E7=BA=BF?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/designhub/service/TaskService.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/backend/src/main/java/com/designhub/service/TaskService.java b/backend/src/main/java/com/designhub/service/TaskService.java index ddaccfe..d6950dc 100644 --- a/backend/src/main/java/com/designhub/service/TaskService.java +++ b/backend/src/main/java/com/designhub/service/TaskService.java @@ -1691,12 +1691,13 @@ public class TaskService { } // 验证任务是否是流水线任务 - // 特殊情况：一级需求部门任务在待完善明细状态下，允许将非流水线任务转换为流水线任务 - boolean isPrimaryTaskPendingDetail = existTask.getIsPrimaryTask() != null + // 特殊情况：一级需求部门任务在草稿或待完善明细状态下，允许将非流水线任务转换为流水线任务 + boolean isPrimaryTaskCanConvert = existTask.getIsPrimaryTask() != null && existTask.getIsPrimaryTask() == 1 - && "pending_detail_completion".equals(existTask.getApprovalStatus()); + && ("pending_detail_completion".equals(existTask.getApprovalStatus()) + || "draft".equals(existTask.getApprovalStatus())); - if ((existTask.getIsPipeline() == null || existTask.getIsPipeline() != 1) && !isPrimaryTaskPendingDetail) { + if ((existTask.getIsPipeline() == null || existTask.getIsPipeline() != 1) && !isPrimaryTaskCanConvert) { throw new BusinessException(ResultCode.PARAM_ERROR, "该任务不是流水线任务"); }