fix: issues 1183、1166

masastack · May 8, 2024 · 6c32b09 · 6c32b09
1 parent 222f8ec
commit 6c32b09
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/Services/Masa.Auth.Service.Admin/Application/Projects/QueryHandler.cs b/src/Services/Masa.Auth.Service.Admin/Application/Projects/QueryHandler.cs
@@ -41,8 +41,8 @@ public async Task GetProjectListAsync(ProjectListQuery query)
     public async Task GetProjectUIAppListAsync(ProjectUIAppListQuery query)
     {
         query.Result = await GetProjectDtoListAsync(_multiEnvironmentUserContext.Environment, AppTypes.UI);
-        var menuPermissions = await _permissionRepository.GetListAsync(p => p.Enabled && p.Type == PermissionTypes.Menu
-                || p.Type == PermissionTypes.Element);
+        var menuPermissions = await _permissionRepository.GetListAsync(p => p.Enabled && (p.Type == PermissionTypes.Menu
+                || p.Type == PermissionTypes.Element));
         query.Result.SelectMany(p => p.Apps).ToList().ForEach(a =>
         {
             a.Navs = menuPermissions.Where(p => p.AppId == a.Identity && p.GetParentId() == Guid.Empty)

diff --git a/src/Web/Masa.Auth.Web.Sso/Pages/Account/Login/Index.razor b/src/Web/Masa.Auth.Web.Sso/Pages/Account/Login/Index.razor
@@ -11,7 +11,7 @@
 
 @if (_viewModel.EnableLocalLogin)
 {
-    <MCard Width=510 Height=620 MaxHeight="620">
+    <MCard Width=510 Height=640 MaxHeight="640">
         <div class="tab-header login-tab">
             <MTabs Value="Tab" ValueChanged="TabChanged" BackgroundColor="transparent" Color="primary" HideSlider Grow >
                 <MTab Value="@("login")" Class="neutral-lighten-4--text" Style="height:60px;">