diff --git a/Marco.Pms.Services/Controllers/EmployeeController.cs b/Marco.Pms.Services/Controllers/EmployeeController.cs index c558de4..21de1bf 100644 --- a/Marco.Pms.Services/Controllers/EmployeeController.cs +++ b/Marco.Pms.Services/Controllers/EmployeeController.cs @@ -171,7 +171,7 @@ namespace MarcoBMS.Services.Controllers { var loggedInEmployee = await _userHelper.GetCurrentEmployeeAsync(); var employeeQuery = _context.Employees.Where(e => e.TenantId == tenantId); - if (projectId != null && projectId == Guid.Empty) + if (projectId != null && projectId != Guid.Empty) { var hasProjectPermission = await _permission.HasProjectPermission(loggedInEmployee, projectId.Value); if (!hasProjectPermission) @@ -187,6 +187,11 @@ namespace MarcoBMS.Services.Controllers var searchStringLower = searchString.ToLower(); employeeQuery = employeeQuery.Where(e => (e.FirstName + " " + e.LastName).ToLower().Contains(searchStringLower)); } + + if (string.IsNullOrWhiteSpace(searchString) && (projectId == null || projectId == Guid.Empty)) + { + employeeQuery = employeeQuery.Take(10); + } var response = await employeeQuery.Select(e => _mapper.Map(e)).ToListAsync(); return Ok(ApiResponse.SuccessResponse(response, $"{response.Count} records of employees fetched successfully", 200)); }