Merge remote-tracking branch 'origin/master'

This commit is contained in:
wangw 2025-03-11 10:32:27 +08:00
commit 9003e18ef4
1 changed files with 2 additions and 2 deletions

View File

@ -54,12 +54,12 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
List<SysMenu> allMenus;
if (queryWrapper.hasCondition()) {
allMenus = list(queryWrapper);
allMenus = list(queryWrapper.orderBy(SysMenu::getMenuSort, false));
return allMenus.stream()
.map(item -> BeanUtil.copyProperties(item, MenuVO.class))
.collect(Collectors.toList());
}else {
allMenus = list();
allMenus = list(new QueryWrapper().orderBy(SysMenu::getMenuSort, false));
return buildMenuTree(allMenus);
}
}