From ebf60eabf778d63323bd6377b4e80a0ef27bea86 Mon Sep 17 00:00:00 2001
From: Argo-Tianyi <argo@163.com>
Date: Mon, 24 Jan 2022 00:47:46 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=E8=84=9A=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BootstrapClient.DataAccess/Services/NavigationService.cs    | 2 +-
 .../client/BootstrapClient.Shared/Extensions/MenuExtensions.cs  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/blazor/client/BootstrapClient.DataAccess/Services/NavigationService.cs b/src/blazor/client/BootstrapClient.DataAccess/Services/NavigationService.cs
index c65c5e69..b07e6c88 100644
--- a/src/blazor/client/BootstrapClient.DataAccess/Services/NavigationService.cs
+++ b/src/blazor/client/BootstrapClient.DataAccess/Services/NavigationService.cs
@@ -28,7 +28,7 @@ class NavigationService : INavigation
     public List<Navigation> GetMenus(string userName)
     {
         var order = Database.Provider.EscapeSqlIdentifier("Order");
-        return Database.Fetch<Navigation>($"select n.ID, n.ParentId, n.Name, n.{order}, n.Icon, n.Url, n.Category, n.Target, n.IsResource, n.Application, ln.Name as ParentName from Navigations n inner join Dicts d on n.Category = d.Code and d.Category = @Category and d.Define = @Define left join Navigations ln on n.ParentId = ln.ID inner join (select nr.NavigationID from Users u inner join UserRole ur on ur.UserID = u.ID inner join NavigationRole nr on nr.RoleID = ur.RoleID where u.UserName = @UserName union select nr.NavigationID from Users u inner join UserGroup ug on u.ID = ug.UserID inner join RoleGroup rg on rg.GroupID = ug.GroupID inner join NavigationRole nr on nr.RoleID = rg.RoleID where u.UserName = @UserName union select n.ID from Navigations n where EXISTS (select UserName from Users u inner join UserRole ur on u.ID = ur.UserID inner join Roles r on ur.RoleID = r.ID where u.UserName = @UserName and r.RoleName = @RoleName)) nav on n.ID = nav.NavigationID ORDER BY n.Application, n.{order}", new { UserName = userName, Category = "菜单", RoleName = "Administrators", Define = 1 });
+        return Database.Fetch<Navigation>($"select n.ID, n.ParentId, n.Name, n.{order}, n.Icon, n.Url, n.Category, n.Target, n.IsResource, n.Application from Navigations n inner join (select nr.NavigationID from Users u inner join UserRole ur on ur.UserID = u.ID inner join NavigationRole nr on nr.RoleID = ur.RoleID where u.UserName = @UserName union select nr.NavigationID from Users u inner join UserGroup ug on u.ID = ug.UserID inner join RoleGroup rg on rg.GroupID = ug.GroupID inner join NavigationRole nr on nr.RoleID = rg.RoleID where u.UserName = @UserName union select n.ID from Navigations n where EXISTS (select UserName from Users u inner join UserRole ur on u.ID = ur.UserID inner join Roles r on ur.RoleID = r.ID where u.UserName = @UserName and r.RoleName = 'Administrators')) nav on n.ID = nav.NavigationID Where n.Category = '1' ORDER BY n.Application, n.{order}", new { UserName = userName });
     }
 
     /// <summary>
diff --git a/src/blazor/client/BootstrapClient.Shared/Extensions/MenuExtensions.cs b/src/blazor/client/BootstrapClient.Shared/Extensions/MenuExtensions.cs
index e515f054..5cf9b95c 100644
--- a/src/blazor/client/BootstrapClient.Shared/Extensions/MenuExtensions.cs
+++ b/src/blazor/client/BootstrapClient.Shared/Extensions/MenuExtensions.cs
@@ -32,7 +32,7 @@ public static class MenuExtensions
     /// 获取前台菜单
     /// </summary>
     /// <returns></returns>
-    public static IEnumerable<MenuItem> ToClientMenus(this List<Navigation> navigations)
+    public static IEnumerable<MenuItem> ToMenus(this IEnumerable<Navigation> navigations)
     {
         var menus = navigations.Where(m => m.IsResource == 0);
         return CascadeMenus(menus);