diff --git a/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/menu/service/impl/SysMenuServiceImpl.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/menu/service/impl/SysMenuServiceImpl.java index dd8005d7f..069473de3 100644 --- a/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/menu/service/impl/SysMenuServiceImpl.java +++ b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/menu/service/impl/SysMenuServiceImpl.java @@ -159,12 +159,14 @@ public class SysMenuServiceImpl extends ServiceImpl impl @Override public List getTotalMenus(Set limitMenuIds) { - if (ObjectUtil.isEmpty(limitMenuIds)) { - return new ArrayList<>(); - } LambdaQueryWrapper menuLambdaQueryWrapper = new LambdaQueryWrapper<>(); menuLambdaQueryWrapper.select(SysMenu::getMenuId, SysMenu::getMenuName, SysMenu::getMenuParentId, SysMenu::getAppId); - menuLambdaQueryWrapper.in(SysMenu::getMenuId, limitMenuIds); + + // 如果限制菜单不为空,则根据限制菜单id进行筛选,否则查询所有菜单 + if (ObjectUtil.isNotEmpty(limitMenuIds)) { + menuLambdaQueryWrapper.in(SysMenu::getMenuId, limitMenuIds); + } + menuLambdaQueryWrapper.orderByAsc(SysMenu::getMenuSort); return this.list(menuLambdaQueryWrapper); }