diff --git a/Marco.Pms.Services/Controllers/EmployeeController.cs b/Marco.Pms.Services/Controllers/EmployeeController.cs index 240d533..4052f32 100644 --- a/Marco.Pms.Services/Controllers/EmployeeController.cs +++ b/Marco.Pms.Services/Controllers/EmployeeController.cs @@ -148,12 +148,11 @@ namespace MarcoBMS.Services.Controllers .Distinct() .ToListAsync(); - employeeIds = employeeIds.Distinct().ToList(); - result = await _context.Employees .Include(fp => fp.JobRole) .Where(e => employeeIds.Contains(e.Id) && e.IsActive) .Select(e => e.ToEmployeeVMFromEmployee()) + .Distinct() .ToListAsync(); _logger.LogInfo("Employee list fetched using limited access (active only)."); diff --git a/Marco.Pms.Services/Helpers/EmployeeHelper.cs b/Marco.Pms.Services/Helpers/EmployeeHelper.cs index bce7628..d79e424 100644 --- a/Marco.Pms.Services/Helpers/EmployeeHelper.cs +++ b/Marco.Pms.Services/Helpers/EmployeeHelper.cs @@ -84,6 +84,7 @@ namespace MarcoBMS.Services.Helpers .ThenInclude(e => e!.JobRole) .Where(c => c.ProjectId == ProjectId.Value && c.IsActive && c.Employee != null) .Select(pa => pa.Employee!.ToEmployeeVMFromEmployee()) + .Distinct() .ToListAsync(); }