From 521cecf9c486343009d5b613fe7b0bedb64a40fc Mon Sep 17 00:00:00 2001
From: sunjiabei <sjb3125@163.com>
Date: Fri, 25 Jul 2025 10:42:36 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=92=E8=89=B2=E7=BC=96=E8=BE=91=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/example/demo/serviceImpl/MenuServiceImpl.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/example/demo/serviceImpl/MenuServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/MenuServiceImpl.java
index f64e61f..801ef9d 100644
--- a/src/main/java/com/example/demo/serviceImpl/MenuServiceImpl.java
+++ b/src/main/java/com/example/demo/serviceImpl/MenuServiceImpl.java
@@ -1,5 +1,6 @@
 package com.example.demo.serviceImpl;
 
+import com.example.demo.domain.entity.Role;
 import com.example.demo.domain.vo.MenuVo;
 import com.example.demo.domain.vo.Result;
 import com.example.demo.domain.vo.RoleMenu;
@@ -114,8 +115,11 @@ public class MenuServiceImpl implements MenuService {
         if (roleVo.getRoleName().length() < 2 || roleVo.getRoleName().length() > 20) {
             return Result.error("角色名长度需在2-20个字符之间");
         }
-        if (roleMapper.selectByRoleName(roleVo.getRoleName()) != null) {
-            return Result.error("角色名重复");
+        Role role = roleMapper.selectByRoleName(roleVo.getRoleName());
+        if (role != null) {
+            if(!role.getId().equals(roleVo.getId())) {
+                return Result.error("角色名重复");
+            }
         }
         if(roleVo.getMenuIds() == null||roleVo.getMenuIds().isEmpty()) {
             return Result.error("角色权限为空");