diff --git a/Marco.Pms.Services/Service/ProjectServices.cs b/Marco.Pms.Services/Service/ProjectServices.cs index d9f1424..ab72c8e 100644 --- a/Marco.Pms.Services/Service/ProjectServices.cs +++ b/Marco.Pms.Services/Service/ProjectServices.cs @@ -639,6 +639,12 @@ namespace Marco.Pms.Services.Service projectAllocationQuery = projectAllocationQuery .Where(pa => pa.Employee != null && pa.Employee.OrganizationId == organizationId.Value && pa.Employee.Organization != null); } + // Conditionally apply the filter for service ID. + if (serviceId.HasValue) + { + projectAllocationQuery = projectAllocationQuery + .Where(pa => pa.Employee != null && pa.ServiceId == serviceId.Value); + } var allocations = await projectAllocationQuery .Select(pa => new