Marco.Pms.Services/Helpers/EmployeeHelper.cs

@@ -76,13 +76,14 @@ namespace MarcoBMS.Services.Helpers
             try
             {
                 List<EmployeeVM> result = new List<EmployeeVM>();
-                if (ProjectId.HasValue)
+                if (ProjectId != null)
                 {
 
-                    result = await _context.ProjectAllocations
+                    result = await (from pa in _context.ProjectAllocations.Where(c => c.ProjectId == ProjectId)
-                        .Include(pa => pa.Employee)
+                                    join em in _context.Employees.Where(c => c.TenantId == TenentId && c.IsActive == true).Include(fp => fp.JobRole) // Include Feature
-                        .Where(c => c.ProjectId == ProjectId.Value && c.IsActive && c.Employee != null)
+                                    on pa.EmployeeId equals em.Id
-                        .Select(pa => pa.Employee!.ToEmployeeVMFromEmployee())
+                                    select em.ToEmployeeVMFromEmployee()
+                                       )
                         .ToListAsync();
 
                 }