From 79d0101e5eb1baa86979b6a6d3c584a2a483320f Mon Sep 17 00:00:00 2001
From: Charles7c <charles7c@126.com>
Date: Wed, 15 May 2024 23:37:48 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=AD=97=E5=85=B8=E7=BC=96=E7=A0=81?=
 =?UTF-8?q?=E3=80=81=E5=AD=98=E5=82=A8=E7=BC=96=E7=A0=81=E5=8F=8A=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E3=80=81=E8=8F=9C=E5=8D=95=E7=B1=BB=E5=9E=8B=E4=B8=8D?=
 =?UTF-8?q?=E5=85=81=E8=AE=B8=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../continew/admin/system/service/impl/DictServiceImpl.java | 6 +-----
 .../continew/admin/system/service/impl/MenuServiceImpl.java | 2 ++
 .../admin/system/service/impl/StorageServiceImpl.java       | 6 +++---
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/DictServiceImpl.java b/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/DictServiceImpl.java
index 567b9d9e..16147ac4 100644
--- a/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/DictServiceImpl.java
+++ b/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/DictServiceImpl.java
@@ -55,12 +55,8 @@ protected void beforeAdd(DictReq req) {
     protected void beforeUpdate(DictReq req, Long id) {
         String name = req.getName();
         CheckUtils.throwIf(this.isNameExists(name, id), "修改失败，[{}] 已存在", name);
-        String code = req.getCode();
-        CheckUtils.throwIf(this.isCodeExists(code, id), "修改失败，[{}] 已存在", code);
         DictDO oldDict = super.getById(id);
-        if (Boolean.TRUE.equals(oldDict.getIsSystem())) {
-            CheckUtils.throwIfNotEqual(req.getCode(), oldDict.getCode(), "[{}] 是系统内置字典，不允许修改字典编码", oldDict.getName());
-        }
+        CheckUtils.throwIfNotEqual(req.getCode(), oldDict.getCode(), "不允许修改字典编码");
     }
 
     @Override
diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/MenuServiceImpl.java b/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/MenuServiceImpl.java
index 69c976d1..abd5524d 100644
--- a/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/MenuServiceImpl.java
+++ b/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/MenuServiceImpl.java
@@ -65,6 +65,8 @@ public Long add(MenuReq req) {
     public void update(MenuReq req, Long id) {
         String title = req.getTitle();
         CheckUtils.throwIf(this.isNameExists(title, req.getParentId(), id), "修改失败，[{}] 已存在", title);
+        MenuDO oldMenu = super.getById(id);
+        CheckUtils.throwIfNotEqual(req.getType(), oldMenu.getType(), "不允许修改菜单类型");
         super.update(req, id);
     }
 
diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/StorageServiceImpl.java b/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/StorageServiceImpl.java
index c515d813..08342169 100644
--- a/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/StorageServiceImpl.java
+++ b/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/StorageServiceImpl.java
@@ -74,10 +74,10 @@ protected void beforeAdd(StorageReq req) {
 
     @Override
     protected void beforeUpdate(StorageReq req, Long id) {
-        String code = req.getCode();
-        CheckUtils.throwIf(this.isCodeExists(code, id), "修改失败，[{}] 已存在", code);
-        DisEnableStatusEnum newStatus = req.getStatus();
         StorageDO oldStorage = super.getById(id);
+        CheckUtils.throwIfNotEqual(req.getCode(), oldStorage.getCode(), "不允许修改存储编码");
+        CheckUtils.throwIfNotEqual(req.getType(), oldStorage.getType(), "不允许修改存储类型");
+        DisEnableStatusEnum newStatus = req.getStatus();
         CheckUtils.throwIf(Boolean.TRUE.equals(oldStorage.getIsDefault()) && DisEnableStatusEnum.DISABLE
             .equals(newStatus), "[{}] 是默认存储，不允许禁用", oldStorage.getName());
         this.decodeSecretKey(req, oldStorage);