Merge pull request '修复菜单只勾选一部分权限/按钮时不现实菜单的问题' (#186) from suncaomei/Admin.NET.Pro:main into main

Reviewed-on: http://101.43.53.74:3000/Admin.NET/Admin.NET.Pro/pulls/186
This commit is contained in:
zuohuaijun 2024-12-02 13:44:29 +08:00
commit a28016b14f

View File

@ -54,7 +54,8 @@ public class SysMenuService : IDynamicApiController, ITransient
{
var menuIdList = await GetMenuIdList();
var menuTree = await _sysMenuRep.AsQueryable()
.Where(u => u.Type != MenuTypeEnum.Btn && u.Status == StatusEnum.Enable)
.Where(u => u.Status == StatusEnum.Enable &&
(u.Type != MenuTypeEnum.Btn || menuIdList.Contains(u.Id)))
.OrderBy(u => new { u.OrderNo, u.Id })
.Distinct().ToTreeAsync(u => u.Children, u => u.Pid, 0, menuIdList.Select(d => (object)d).ToArray());
return menuTree.Adapt<List<MenuOutput>>();