瀏覽代碼

fix:修复禁用菜单栏目无效

徐少年 3 年之前
父節點
當前提交
57bb685078
共有 1 個文件被更改,包括 2 次插入 和 1 次删除
  1. 2 1
      Admin.NET/Admin.NET.Core/Service/Menu/SysMenuService.cs

+ 2 - 1
Admin.NET/Admin.NET.Core/Service/Menu/SysMenuService.cs

@@ -35,7 +35,7 @@ public class SysMenuService : IDynamicApiController, ITransient
         if (_userManager.SuperAdmin)
         if (_userManager.SuperAdmin)
         {
         {
             var menuList = await _sysMenuRep.AsQueryable()
             var menuList = await _sysMenuRep.AsQueryable()
-                .Where(u => u.Type != MenuTypeEnum.Btn)
+                .Where(u => u.Type != MenuTypeEnum.Btn && u.Status == StatusEnum.Enable)
                 .OrderBy(u => u.OrderNo).ToTreeAsync(u => u.Children, u => u.Pid, 0);
                 .OrderBy(u => u.OrderNo).ToTreeAsync(u => u.Children, u => u.Pid, 0);
             return menuList.Adapt<List<MenuOutput>>();
             return menuList.Adapt<List<MenuOutput>>();
         }
         }
@@ -43,6 +43,7 @@ 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.Status == StatusEnum.Enable)
                 .OrderBy(u => u.OrderNo).ToTreeAsync(u => u.Children, u => u.Pid, 0, menuIdList.Select(d => (object)d).ToArray());
                 .OrderBy(u => u.OrderNo).ToTreeAsync(u => u.Children, u => u.Pid, 0, menuIdList.Select(d => (object)d).ToArray());
             DeleteBtnFromMenuTree(menuTree);
             DeleteBtnFromMenuTree(menuTree);
             return menuTree.Adapt<List<MenuOutput>>();
             return menuTree.Adapt<List<MenuOutput>>();