Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.api

Marco.Pms.Services/Controllers/EmployeeController.cs

@@ -148,13 +148,14 @@ namespace MarcoBMS.Services.Controllers
                     .Distinct()
                     .ToListAsync();
 
-                result = await _context.Employees
+                var employees = await _context.Employees
                         .Include(fp => fp.JobRole)
-                    .Where(e => employeeIds.Contains(e.Id) && e.IsActive && e.TenantId == tenantId)
-                    .Select(e => e.ToEmployeeVMFromEmployee())
+                        .Where(e => employeeIds.Contains(e.Id) && e.JobRole != null && e.IsActive && e.TenantId == tenantId)
                         .Distinct()
                         .ToListAsync();
 
+                result = employees.Select(e => e.ToEmployeeVMFromEmployee()).ToList();
+
                 _logger.LogInfo("Employee list fetched using limited access (active only).");
             }
             else

Marco.Pms.Services/Helpers/EmployeeHelper.cs

@@ -85,12 +85,12 @@ namespace MarcoBMS.Services.Helpers
                     .Distinct()
                     .ToListAsync();
 
-                    result = await _context.Employees
+                    var employees = await _context.Employees
                         .Include(fp => fp.JobRole)
-                        .Where(e => employeeIds.Contains(e.Id) && e.IsActive && e.TenantId == tenantId)
-                        .Select(e => e.ToEmployeeVMFromEmployee())
+                        .Where(e => employeeIds.Contains(e.Id) && e.JobRole != null && e.IsActive && e.TenantId == tenantId)
                         .Distinct()
                         .ToListAsync();
+                    result = employees.Select(e => e.ToEmployeeVMFromEmployee()).ToList();
 
                 }
                 else if (ShowInActive)