fix(Menu): 增加可为空支持防止异常崩溃

ArgoZhang · Apr 23, 2024 · ff73902 · ff73902
1 parent e30fd9b
commit ff73902
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/blazor/admin/BootstrapAdmin.Web/Extensions/MenuExtensions.cs b/src/blazor/admin/BootstrapAdmin.Web/Extensions/MenuExtensions.cs
@@ -20,7 +20,7 @@ public static class MenuExtensions
         public static MenuItem Parse(this DataAccess.Models.Navigation menu) => new()
         {
             Text = menu.Name,
-            Url = menu.Url.Replace("~/", "/"),
+            Url = menu.Url?.Replace("~/", "/"),
             Icon = menu.Icon,
             Match = NavLinkMatch.All,
             Target = menu.Target,

diff --git a/src/blazor/client/BootstrapClient.Web.Core/AdminService.cs b/src/blazor/client/BootstrapClient.Web.Core/AdminService.cs
@@ -52,7 +52,7 @@ public Task<bool> AuthorizingNavigation(string userName, string url)
         if (Uri.TryCreate(url, UriKind.RelativeOrAbsolute, out var uri))
         {
             ret = Navigations.GetMenus(userName)
-                .Any(m => m.Url.Contains(uri.AbsolutePath, StringComparison.OrdinalIgnoreCase));
+                .Any(m => m.Url?.Contains(uri.AbsolutePath, StringComparison.OrdinalIgnoreCase) ?? false);
         }
         return Task.FromResult(ret);
     }