From d364b8173cc5a56c6ad8fd2d056a84b43a1b6099 Mon Sep 17 00:00:00 2001 From: Your Name Date: Thu, 22 Jan 2026 16:27:54 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=B8=80=E7=BA=A7?= =?UTF-8?q?=E9=9C=80=E6=B1=82=E9=83=A8=E9=97=A8=E6=92=A4=E5=9B=9E=E9=87=8D?= =?UTF-8?q?=E6=96=B0=E7=BC=96=E8=BE=91=E4=BB=BB=E5=8A=A1=E5=90=8E=E5=8F=91?= =?UTF-8?q?=E5=B8=83=E6=97=B6=E7=9A=84=E6=95=B0=E6=8D=AE=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../designhub/controller/TaskController.java | 7 +++-- frontend/src/views/CreateTask.vue | 29 ++++++++++++++++--- 2 files changed, 30 insertions(+), 6 deletions(-) diff --git a/backend/src/main/java/com/designhub/controller/TaskController.java b/backend/src/main/java/com/designhub/controller/TaskController.java index 72461c2..3062454 100644 --- a/backend/src/main/java/com/designhub/controller/TaskController.java +++ b/backend/src/main/java/com/designhub/controller/TaskController.java @@ -148,8 +148,11 @@ public class TaskController { com.fasterxml.jackson.databind.JsonNode jsonNode = objectMapper.readTree(json); // 检查是否是流水线任务格式 - if (jsonNode.has("isPipeline") && jsonNode.get("isPipeline").asBoolean() || - jsonNode.has("items") && jsonNode.get("items").isArray()) { + // 只有当 isPipeline = true 或 items 非空时才判断为流水线任务 + boolean isPipeline = jsonNode.has("isPipeline") && jsonNode.get("isPipeline").asBoolean(); + boolean hasItems = jsonNode.has("items") && jsonNode.get("items").isArray() && jsonNode.get("items").size() > 0; + + if (isPipeline || hasItems) { // 流水线任务更新 com.designhub.dto.PipelineTaskDTO dto = objectMapper.convertValue(taskData, com.designhub.dto.PipelineTaskDTO.class); taskService.updatePipelineTask(id, dto, userId); diff --git a/frontend/src/views/CreateTask.vue b/frontend/src/views/CreateTask.vue index bd38bcb..e8fc586 100644 --- a/frontend/src/views/CreateTask.vue +++ b/frontend/src/views/CreateTask.vue @@ -1670,11 +1670,32 @@ const handleSubmit = async () => { if (editMode.value && editTaskId.value) { // 编辑模式:更新任务并重新提交审核 - const updateData = { - ...pipelineData, - id: editTaskId.value + if (isPrimaryDeptWithoutDetail) { + // 一级需求部门不填写任务明细时,使用普通任务格式 + const taskData = { + title: formData.title, + brandId: formData.brandId, + platformId: formData.platformId, + categoryId: formData.categoryId, + spuInfo: formData.spuInfo, + taskSubType: formData.taskSubType, + attachmentUrl: attachmentUrl, + remark: formData.remark || '', + priority: formData.isUrgent ? 3 : 1, + releaseType: formData.releaseType, + productBarcodes: formData.productBarcodes, + previewImage: formData.previewImage, + id: editTaskId.value + } + response = await taskApi.updateTask(editTaskId.value, taskData as any) + } else { + // 流水线任务更新 + const updateData = { + ...pipelineData, + id: editTaskId.value + } + response = await taskApi.updateTask(editTaskId.value, updateData) } - response = await taskApi.updateTask(editTaskId.value, updateData) if (response.code === 200) { message.success('任务已重新提交审核')