From 76b63d955e90f66fff58496c0311b74b692f7320 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 29 五月 2025 13:57:09 +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 | 4 ++--
1 files changed, 2 insertions(+), 2 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 9c94eb3..d58dd54 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
@@ -102,7 +102,7 @@
if (Objects.isNull(ids) || ids.length < 1) {
return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
- return taskService.removeTask(ids);
+ return taskService.removeTask(ids, getLoginUserId());
// return R.ok("Delete Success").add(ids);
}
@@ -141,7 +141,7 @@
for (Task task : tasks) {
if (StringUtils.isNotBlank(task.getParentId() + "")) {
Task task1 = taskService.getById(task.getParentId());
- if (!Objects.isNull(task1)) {
+ if (!Objects.isNull(task1) && task1.getTaskType().equals(TaskStsType.UPDATED_IN.id)) {
throw new CoolException("鐖朵换鍔★細" + task1.getTaskCode() + "鏈墽琛屽畬鎴愶紒");
}
}
--
Gitblit v1.9.1