From 9e91f563e2a263ce302dc3bf17c89e37c2b56285 Mon Sep 17 00:00:00 2001
From: Charles7c <charles7c@126.com>
Date: Thu, 22 Aug 2024 20:53:01 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=9B=AE=E5=BD=95?=
 =?UTF-8?q?=E3=80=81=E8=8F=9C=E5=8D=95=E7=9A=84=E7=BB=84=E4=BB=B6=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0=E9=87=8D=E5=A4=8D=E7=9A=84=E9=94=99=E8=AF=AF=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/service/impl/MenuServiceImpl.java  | 39 +++++++++++++++----
 1 file changed, 32 insertions(+), 7 deletions(-)

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 6911cb65..0c4ed99f 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
@@ -52,7 +52,12 @@ public class MenuServiceImpl extends BaseServiceImpl<MenuMapper, MenuDO, MenuRes
     @Override
     public Long add(MenuReq req) {
         String title = req.getTitle();
-        CheckUtils.throwIf(this.isNameExists(title, req.getParentId(), null), "新增失败，[{}] 已存在", title);
+        CheckUtils.throwIf(this.isTitleExists(title, req.getParentId(), null), "新增失败，标题 [{}] 已存在", title);
+        // 目录和菜单的组件名称不能重复
+        if (!MenuTypeEnum.BUTTON.equals(req.getType())) {
+            String name = req.getName();
+            CheckUtils.throwIf(this.isNameExists(name, null), "新增失败，组件名称 [{}] 已存在", name);
+        }
         // 目录类型菜单，默认为 Layout
         if (MenuTypeEnum.DIR.equals(req.getType())) {
             req.setComponent(StrUtil.blankToDefault(req.getComponent(), "Layout"));
@@ -64,7 +69,12 @@ public class MenuServiceImpl extends BaseServiceImpl<MenuMapper, MenuDO, MenuRes
     @Override
     public void update(MenuReq req, Long id) {
         String title = req.getTitle();
-        CheckUtils.throwIf(this.isNameExists(title, req.getParentId(), id), "修改失败，[{}] 已存在", title);
+        CheckUtils.throwIf(this.isTitleExists(title, req.getParentId(), id), "修改失败，标题 [{}] 已存在", title);
+        // 目录和菜单的组件名称不能重复
+        if (!MenuTypeEnum.BUTTON.equals(req.getType())) {
+            String name = req.getName();
+            CheckUtils.throwIf(this.isNameExists(name, id), "修改失败，组件名称 [{}] 已存在", name);
+        }
         MenuDO oldMenu = super.getById(id);
         CheckUtils.throwIfNotEqual(req.getType(), oldMenu.getType(), "不允许修改菜单类型");
         super.update(req, id);
@@ -100,18 +110,33 @@ public class MenuServiceImpl extends BaseServiceImpl<MenuMapper, MenuDO, MenuRes
     }
 
     /**
-     * 名称是否存在
+     * 标题是否存在
      *
-     * @param name     名称
+     * @param title    标题
      * @param parentId 上级 ID
      * @param id       ID
-     * @return 是否存在
+     * @return true：存在；false：不存在
      */
-    private boolean isNameExists(String name, Long parentId, Long id) {
+    private boolean isTitleExists(String title, Long parentId, Long id) {
         return baseMapper.lambdaQuery()
-            .eq(MenuDO::getTitle, name)
+            .eq(MenuDO::getTitle, title)
             .eq(MenuDO::getParentId, parentId)
             .ne(null != id, MenuDO::getId, id)
             .exists();
     }
+
+    /**
+     * 名称是否存在
+     *
+     * @param name 标题
+     * @param id   ID
+     * @return true：存在；false：不存在
+     */
+    private boolean isNameExists(String name, Long id) {
+        return baseMapper.lambdaQuery()
+            .eq(MenuDO::getName, name)
+            .ne(MenuDO::getType, MenuTypeEnum.BUTTON)
+            .ne(null != id, MenuDO::getId, id)
+            .exists();
+    }
 }