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 +2
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit bd421d45aa - Show all commits

2
Marco.Pms.Services/Controllers/AttendanceController.cs
View File

@ -821,6 +821,8 @@ namespace MarcoBMS.Services.Controllers
var query = _context.ProjectAllocations var query = _context.ProjectAllocations
.Include(pa => pa.Employee) .Include(pa => pa.Employee)
.ThenInclude(e => e!.Organization) .ThenInclude(e => e!.Organization)
.Include(pa => pa.Employee)
.ThenInclude(e => e!.JobRole)
.Where(pa => pa.TenantId == tenantId && pa.ProjectId == projectId); .Where(pa => pa.TenantId == tenantId && pa.ProjectId == projectId);
// Apply filters based on optional parameters // Apply filters based on optional parameters