From 307d5a291ca19496d4abee0e099ebe3eb39ac7d2 Mon Sep 17 00:00:00 2001
From: verou <857149855@qq.com>
Date: 星期三, 02 四月 2025 10:59:19 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java
index a9fae5a..2805e07 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java
@@ -91,11 +91,12 @@
if (Objects.isNull(ids) || ids.length < 1) {
return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
+ List<TaskItem> list = taskItemService.list(new LambdaQueryWrapper<TaskItem>().in(TaskItem::getTaskId, ids));
+ if (!list.isEmpty()) {
+ return R.error("鏈夋槑缁嗗垪琛ㄥ瓨鍦� 锛侊紒");
+ }
if (!taskService.removeByIds(Arrays.asList(ids))) {
return R.error("Delete Fail");
- }
- if (!taskItemService.remove(new LambdaQueryWrapper<TaskItem>().in(TaskItem::getTaskId, ids))) {
- return R.error("鍒犻櫎澶辫触锛侊紒");
}
return R.ok("Delete Success").add(ids);
}
--
Gitblit v1.9.1