From 374e023cde4d56375c8f024f5f07f85b84bb7414 Mon Sep 17 00:00:00 2001
From: pramod mahajan <pramod.mahajan@marcoaiot.com>
Date: Mon, 18 Aug 2025 10:29:53 +0530
Subject: [PATCH] added perfectly permssion checking coondition and fixed
 previous mistake

---
 Marco.Pms.Services/Controllers/AppMenuController.cs | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/Marco.Pms.Services/Controllers/AppMenuController.cs b/Marco.Pms.Services/Controllers/AppMenuController.cs
index 9c5d557..cc48d16 100644
--- a/Marco.Pms.Services/Controllers/AppMenuController.cs
+++ b/Marco.Pms.Services/Controllers/AppMenuController.cs
@@ -228,8 +228,8 @@ namespace Marco.Pms.Services.Controllers
         [HttpGet("sidebar/menu-section")]
         public async Task<IActionResult> GetAppSideBarMenu()
         {
-            var loggedUser = await _userHelper.GetCurrentUserAsync();
-            var employeeId = Guid.Parse(loggedUser.Id);
+            var loggedUser = await _userHelper.GetCurrentEmployeeAsync();
+            var employeeId = loggedUser.Id;
 
             var menus = await _sideBarMenuHelper.GetAllMenuSectionsAsync();
 
@@ -268,10 +268,9 @@ namespace Marco.Pms.Services.Controllers
                             var allowedSubmenus = new List<SubMenuItem>();
                             foreach (var sm in item.Submenu)
                             {
-                                bool smAllowed = false;
                                 if (sm.PermissionKeys == null || !sm.PermissionKeys.Any())
                                 {
-                                    smAllowed = true;
+                                    allowedSubmenus.Add(sm);
                                 }
                                 else
                                 {
@@ -281,15 +280,12 @@ namespace Marco.Pms.Services.Controllers
                                         {
                                             if (await _permissions.HasPermission(employeeId, permissionId))
                                             {
-                                                smAllowed = true;
+                                                allowedSubmenus.Add(sm);
                                                 break;
                                             }
                                         }
                                     }
                                 }
-
-                                if (smAllowed)
-                                    allowedSubmenus.Add(sm);
                             }
                             item.Submenu = allowedSubmenus;
                         }
@@ -305,7 +301,6 @@ namespace Marco.Pms.Services.Controllers
         }
 
 
-
     }