From 221b72ce4da14b97dc5aa5afe43eae2c68fb88b0 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期五, 18 七月 2025 20:53:21 +0800
Subject: [PATCH] Merge branch 'huliguo' of http://120.76.84.145:10101/gitblit/r/java/ZhengShengXinAdmin into huliguo
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
index 7ad7bd7..91ce918 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
@@ -480,14 +480,21 @@
//判断角色名称是否存在
SysRole sysRole = new SysRole();
sysRole.setRoleName(dto.getRoleName());
+
List<SysRole> sysRoles = roleMapper.selectRoleList(sysRole);
if (sysRoles!=null && !sysRoles.isEmpty()){
- throw new ServiceException("该角色名称重复");
+ sysRoles.forEach(role -> {
+ if (!role.getRoleId().equals(dto.getRoleId())){
+ throw new ServiceException("该角色名称重复");
+ }
+ });
}
- //删除之前的
+ //删除之前的角色菜单关联
roleMenuMapper.deleteRoleMenuByRoleId(dto.getRoleId());
+ //修改角色名称
+ roleMapper.updateRole(sysRole);
//添加角色菜单
- roleMenuMapper.insert(sysRole.getRoleId(),dto.getMenuIds());
+ roleMenuMapper.insert(dto.getRoleId(),dto.getMenuIds());
}
@Override
--
Gitblit v1.7.1