From d0dabf776ba0413bb8563998117b3132e0a1abe8 Mon Sep 17 00:00:00 2001 From: "ashutosh.nehete" Date: Sat, 4 Oct 2025 17:26:08 +0530 Subject: [PATCH] Added the condition to not get services object in project allocation --- Marco.Pms.Services/Service/ProjectServices.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Marco.Pms.Services/Service/ProjectServices.cs b/Marco.Pms.Services/Service/ProjectServices.cs index 1489197..096ac56 100644 --- a/Marco.Pms.Services/Service/ProjectServices.cs +++ b/Marco.Pms.Services/Service/ProjectServices.cs @@ -716,7 +716,7 @@ namespace Marco.Pms.Services.Service .Include(pa => pa.Employee) .ThenInclude(e => e!.Organization) .Include(pa => pa.Service) - .Where(pa => pa.ProjectId == projectId && pa.TenantId == tenantId && pa.Service != null); + .Where(pa => pa.ProjectId == projectId && pa.TenantId == tenantId); // Conditionally apply the filter for active allocations. if (!includeInactive) @@ -738,6 +738,7 @@ namespace Marco.Pms.Services.Service } var allocations = await projectAllocationQuery + .Where(pa => pa.Service != null) .Select(pa => new { // Fields from ProjectAllocation