dromara/RuoYi-Cloud-Plus
1
0
Fork 0
mirror of https://gitee.com/dromara/RuoYi-Cloud-Plus.git synced 2026-02-27 01:00:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix 修复 不同类别菜单的判断逻辑有误问题

Browse Source
This commit is contained in:
疯狂的狮子Li
2026-01-21 11:48:04 +08:00
parent 482a3396c0
commit 89f8f51da0
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysMenuServiceImpl.java
View File

@@ -374,21 +374,24 @@ public class SysMenuServiceImpl implements ISysMenuService {
List<SysMenu> sysMenuList = baseMapper.selectList( List<SysMenu> sysMenuList = baseMapper.selectList(
new LambdaQueryWrapper<SysMenu>() new LambdaQueryWrapper<SysMenu>()
.in(SysMenu::getMenuType, SystemConstants.TYPE_DIR, SystemConstants.TYPE_MENU) .in(SysMenu::getMenuType, SystemConstants.TYPE_DIR, SystemConstants.TYPE_MENU)
.eq(SysMenu::getPath, path).or().eq(SysMenu::getPath, routeName)); .and(w ->
w.eq(SysMenu::getPath, path).or().eq(SysMenu::getPath, routeName)
));
for (SysMenu sysMenu : sysMenuList) { for (SysMenu sysMenu : sysMenuList) {
if (sysMenu.getMenuId() != menuId) { if (!sysMenu.getMenuId().equals(menuId)) {
Long dbParentId = sysMenu.getParentId(); Long dbParentId = sysMenu.getParentId();
String dbPath = sysMenu.getPath(); String dbPath = sysMenu.getPath();
String dbRouteName = StringUtils.isEmpty(sysMenu.getRouteName()) ? dbPath : sysMenu.getRouteName(); String dbRouteName = StringUtils.isEmpty(sysMenu.getRouteName()) ? dbPath : sysMenu.getRouteName();
if (StringUtils.equalsAnyIgnoreCase(path, dbPath) && parentId.longValue() == dbParentId.longValue()) { if (StringUtils.equalsAnyIgnoreCase(path, dbPath) && parentId.equals(dbParentId)) {
log.warn("[同级路由冲突] 同级下已存在相同路由路径 '{}'，冲突菜单：{}", dbPath, sysMenu.getMenuName()); log.warn("[同级路由冲突] 同级下已存在相同路由路径 '{}'，冲突菜单：{}", dbPath, sysMenu.getMenuName());
return false; return false;
} else if (StringUtils.equalsAnyIgnoreCase(path, dbPath) } else if (StringUtils.equalsAnyIgnoreCase(path, dbPath)
&& parentId.longValue() == Constants.TOP_PARENT_ID && Constants.TOP_PARENT_ID.equals(parentId)
&& dbParentId.longValue() == Constants.TOP_PARENT_ID) { && Constants.TOP_PARENT_ID.equals(dbParentId)) {
log.warn("[根目录路由冲突] 根目录下路由 '{}' 必须唯一，已被菜单 '{}' 占用", path, sysMenu.getMenuName()); log.warn("[根目录路由冲突] 根目录下路由 '{}' 必须唯一，已被菜单 '{}' 占用", path, sysMenu.getMenuName());
return false; return false;
} else if (StringUtils.equalsAnyIgnoreCase(routeName, dbRouteName)) { } else if (StringUtils.equalsAnyIgnoreCase(routeName, dbRouteName)
&& sysMenu.getMenuType().equals(menu.getMenuType())) {
log.warn("[路由名称冲突] 路由名称 '{}' 需全局唯一，已被菜单 '{}' 使用", routeName, sysMenu.getMenuName()); log.warn("[路由名称冲突] 路由名称 '{}' 需全局唯一，已被菜单 '{}' 使用", routeName, sysMenu.getMenuName());
return false; return false;
} }