diff --git a/Marco.Pms.Services/Service/ProjectServices.cs b/Marco.Pms.Services/Service/ProjectServices.cs index a9cca93..48e2cc1 100644 --- a/Marco.Pms.Services/Service/ProjectServices.cs +++ b/Marco.Pms.Services/Service/ProjectServices.cs @@ -1434,8 +1434,7 @@ namespace Marco.Pms.Services.Service return ApiResponse.SuccessResponse(result, "Employee list fetched successfully", 200); } - public async Task> GetProjectTeamByServiceAndOrganizationAsync( - Guid projectId, Guid? serviceId, Guid? organizationId, Employee loggedInEmployee, Guid tenantId) + public async Task> GetProjectTeamByServiceAndOrganizationAsync(Guid projectId, Guid? serviceId, Guid? organizationId, Employee loggedInEmployee, Guid tenantId) { _logger.LogDebug("Started fetching project team. ProjectId: {ProjectId}, ServiceId: {ServiceId}, OrganizationId: {OrganizationId}, TenantId: {TenantId}, EmployeeId: {EmployeeId}", projectId, serviceId ?? Guid.Empty, organizationId ?? Guid.Empty, tenantId, loggedInEmployee.Id); @@ -1513,7 +1512,8 @@ namespace Marco.Pms.Services.Service .ThenInclude(e => e!.JobRole) .Where(pa => pa.ProjectId == projectId && pa.Employee != null - && organizationIds.Contains(pa.Employee.OrganizationId)); + && organizationIds.Contains(pa.Employee.OrganizationId) + && pa.IsActive); if (serviceId.HasValue) { @@ -1530,6 +1530,8 @@ namespace Marco.Pms.Services.Service var employeeList = projectAllocations .Select(pa => _mapper.Map(pa.Employee)) .Distinct() + .OrderBy(e => e.FirstName) + .ThenBy(e => e.LastName) .ToList(); _logger.LogInfo("Fetched {EmployeeCount} employees for Project {ProjectId}.", employeeList.Count, projectId);