admin/marco.pms.api
1
0
Fork 0
Code Issues Pull Requests 3 Actions Packages Projects Releases Wiki Activity

Organization_Management #142

Merged
ashutosh.nehete merged 92 commits from Organization_Management into main 2025-09-30 09:05:14 +00:00
Conversation 0 Commits 92 Files Changed 126 +6
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 0ba4ccf45c - Show all commits

6
Marco.Pms.Services/Service/ProjectServices.cs
View File

@ -639,6 +639,12 @@ namespace Marco.Pms.Services.Service
projectAllocationQuery = projectAllocationQuery projectAllocationQuery = projectAllocationQuery
.Where(pa => pa.Employee != null && pa.Employee.OrganizationId == organizationId.Value && pa.Employee.Organization != null); .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 var allocations = await projectAllocationQuery
.Select(pa => new .Select(pa => new