gaoxing/UNIVPLMDataIntegration
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Admin.NET/Admin.NET.Core/Service/Menu/SysMenuService.cs
View File

@ -54,7 +54,8 @@ public class SysMenuService : IDynamicApiController, ITransient
{ {
var menuIdList = await GetMenuIdList(); var menuIdList = await GetMenuIdList();
var menuTree = await _sysMenuRep.AsQueryable() 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 }) .OrderBy(u => new { u.OrderNo, u.Id })
.Distinct().ToTreeAsync(u => u.Children, u => u.Pid, 0, menuIdList.Select(d => (object)d).ToArray()); .Distinct().ToTreeAsync(u => u.Children, u => u.Pid, 0, menuIdList.Select(d => (object)d).ToArray());
return menuTree.Adapt<List<MenuOutput>>(); return menuTree.Adapt<List<MenuOutput>>();