From b5e8045d5f5b5401b696db12f62fdbcc86dc5c5d Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 10 四月 2025 11:40:02 +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/QlyInspectController.java |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/QlyInspectController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/QlyInspectController.java
index db6a786..57d0e20 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/QlyInspectController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/QlyInspectController.java
@@ -103,9 +103,7 @@
     @PostMapping("/qlyInspect/save")
     public R save(@RequestBody QlyInspect qlyInspect) {
         qlyInspect.setCreateBy(getLoginUserId());
-        qlyInspect.setCreateTime(new Date());
         qlyInspect.setUpdateBy(getLoginUserId());
-        qlyInspect.setUpdateTime(new Date());
         if (!qlyInspectService.save(qlyInspect)) {
             return R.error("Save Fail");
         }
@@ -128,6 +126,13 @@
     @OperationLog("Delete 璐ㄦ淇℃伅")
     @PostMapping("/qlyInspect/remove/{ids}")
     public R remove(@PathVariable Long[] ids) {
+        if (Objects.isNull(ids) || ids.length < 1) {
+            return R.error("鑳芥暟涓嶈兘涓虹┖锛侊紒");
+        }
+        List<QlyInspect> qlyInspects = qlyInspectService.list(new LambdaQueryWrapper<QlyInspect>().in(QlyInspect::getId, ids));
+        if (!qlyInspects.isEmpty()) {
+            return R.error("鏈夋槑缁嗗垪琛ㄥ瓨鍦紒锛�");
+        }
         if (!qlyInspectService.removeByIds(Arrays.asList(ids))) {
             return R.error("Delete Fail");
         }

--
Gitblit v1.9.1