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 a9b4b79ee4 - Show all commits

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

@ -753,8 +753,10 @@ namespace Marco.Pms.Services.Service
LastName = pa.Employee.LastName, LastName = pa.Employee.LastName,
MiddleName = pa.Employee.MiddleName, MiddleName = pa.Employee.MiddleName,
OrganizationId = pa.Employee.OrganizationId,
OrganizationName = pa.Employee.Organization!.Name, OrganizationName = pa.Employee.Organization!.Name,
ServiceId = pa.ServiceId,
ServiceName = pa.Service!.Name, ServiceName = pa.Service!.Name,
// Simplified JobRoleId logic: Use the allocation's role if it exists, otherwise fall back to the employee's default role. // Simplified JobRoleId logic: Use the allocation's role if it exists, otherwise fall back to the employee's default role.