From c2f944f370907d26d30f81daa6947d4b2ee2a355 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期六, 22 三月 2025 15:38:00 +0800
Subject: [PATCH] # 绑定bug修复

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseController.java |   17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseController.java
index 418763b..f97553f 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseController.java
@@ -101,14 +101,21 @@
         }
         warehouse.setUpdateBy(getLoginUserId());
 
-        List<Warehouse> warehouses = warehouseService.list(new LambdaQueryWrapper<Warehouse>().eq(Warehouse::getName, warehouse.getName()));
-        if (!warehouses.isEmpty()) {
-            throw new CoolException("浠撳簱鍚嶇О宸插瓨鍦紒锛�");
+        Warehouse warehouse1 = warehouseService.getById(warehouse.getId());
+        if (!warehouse.getName().equals(warehouse1.getName())) {
+            List<Warehouse> areasList = warehouseService.list(new LambdaQueryWrapper<Warehouse>().eq(Warehouse::getName, warehouse1.getName()));
+            if (!areasList.isEmpty()) {
+                throw new CoolException("浠撳簱鍚嶅凡瀛樺湪锛侊紒");
+            }
         }
-        if (!warehouseService.list(new LambdaQueryWrapper<Warehouse>().eq(Warehouse::getCode, warehouse.getCode())).isEmpty()) {
-            throw new CoolException("浠撳簱缂栫爜宸插瓨鍦紒锛�");
+        if (!warehouse.getCode().equals(warehouse1.getCode())) {
+            List<Warehouse> areasList = warehouseService.list(new LambdaQueryWrapper<Warehouse>().eq(Warehouse::getCode, warehouse1.getCode()));
+            if (!areasList.isEmpty()) {
+                throw new CoolException("浠撳簱缂栫爜宸插瓨鍦紒锛�");
+            }
         }
 
+
         if (!warehouseService.updateById(warehouse)) {
             return R.error("Update Fail");
         }

--
Gitblit v1.9.1