diff --git a/Marco.Pms.Services/Controllers/AppMenuController.cs b/Marco.Pms.Services/Controllers/AppMenuController.cs index 9adbf83..107797f 100644 --- a/Marco.Pms.Services/Controllers/AppMenuController.cs +++ b/Marco.Pms.Services/Controllers/AppMenuController.cs @@ -549,10 +549,6 @@ namespace Marco.Pms.Services.Controllers using var scope = _serviceScopeFactory.CreateScope(); var generalHelper = scope.ServiceProvider.GetRequiredService(); - // Fetch features enabled for tenant - var featureIds = await generalHelper.GetFeatureIdsByTenentIdAsync(tenantId); - _logger.LogInfo("Enabled features for TenantId: {TenantId} -> {FeatureIds}", tenantId, string.Join(",", featureIds)); - // Define static master menus for each feature section var featureMenus = new Dictionary> { @@ -586,6 +582,17 @@ namespace Marco.Pms.Services.Controllers } }; + if (tenantId == superTenantId) + { + _logger.LogInfo("MasterMenu count for TenantId {TenantId}: {Count}", tenantId, featureMenus.Count); + + return Ok(ApiResponse.SuccessResponse(featureMenus, "Successfully fetched the master table list", 200)); + } + + // Fetch features enabled for tenant + var featureIds = await generalHelper.GetFeatureIdsByTenentIdAsync(tenantId); + _logger.LogInfo("Enabled features for TenantId: {TenantId} -> {FeatureIds}", tenantId, string.Join(",", featureIds)); + // Aggregate menus based on enabled features var response = featureIds .Where(id => featureMenus.ContainsKey(id))