From 0a2860fff538f918a0315b56de353752ecba7c8a Mon Sep 17 00:00:00 2001
From: erdanergou <p17686264821@163.com>
Date: Sat, 17 Jun 2023 11:09:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=98=E7=9B=98=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E8=BF=9B=E8=A1=8C=E4=BF=AE=E6=94=B9=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/PlaceController.java           | 26 +++++++++++++------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/PlaceController.java b/src/main/java/com/dreamchaser/depository_manage/controller/PlaceController.java
index 6df6f282..47c2ce3d 100644
--- a/src/main/java/com/dreamchaser/depository_manage/controller/PlaceController.java
+++ b/src/main/java/com/dreamchaser/depository_manage/controller/PlaceController.java
@@ -109,7 +109,7 @@ public class PlaceController {
                 if (maxQuantity >= 999999999) {
                     insert.put("max", 999999999);
                 } else {
-                    insert.put("max",maxQuantity);
+                    insert.put("max", maxQuantity);
                 }
             } else {
                 insert.put("max", 0);
@@ -317,18 +317,28 @@ public class PlaceController {
 
     @PostMapping("/tray_edit")
     public RestResponse trayEdit(@RequestBody Map<String, Object> map) {
+        if (!map.containsKey("id")) {
+            throw new MyException("缺少必要参数");
+        }
+        Integer id = ObjectFormatUtil.toInteger(map.get("id"));
         if (map.containsKey("state")) {
             map.put("state", 1);
         } else {
             map.put("state", 2);
         }
         String code = (String) map.get("code");
-        Integer depositoryId = ObjectFormatUtil.toInteger(map.get("did"));
-        Place placeByDidAndCode = placeService.findPlaceByDidAndCode(depositoryId, code);
-        if (placeByDidAndCode != null) {
-            return new RestResponse("", 12345, new StatusInfo("修改失败", "该编码已经存在"));
-        }
+        Place placeById = placeService.findPlaceById(id);
         Map<String, Object> update = new HashMap<>();
+        if (!code.equals(placeById.getCode())) {
+            Integer depositoryId = ObjectFormatUtil.toInteger(map.get("did"));
+            Place placeByDidAndCode = placeService.findPlaceByDidAndCode(depositoryId, code);
+            if (placeByDidAndCode == null) {
+                update.put("code", code);
+            } else {
+                return new RestResponse("", 12345, new StatusInfo("修改失败", "该编码已经存在"));
+            }
+        }
+
         String min = (String) map.get("min");
         String max = (String) map.get("max");
         if (!"".equals(min)) {
@@ -346,8 +356,8 @@ public class PlaceController {
         } else {
             update.put("max", 50000);
         }
-        update.put("code", code);
-        update.put("id", map.get("id"));
+
+        update.put("id", id);
         return CrudUtil.insertHandle(placeService.UpdatePlace(update), 1);
     }