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

13
Marco.Pms.Services/Controllers/EmployeeController.cs
View File

@ -148,12 +148,13 @@ namespace MarcoBMS.Services.Controllers
.Distinct() .Distinct()
.ToListAsync(); .ToListAsync();
result = await _context.Employees var employees = await _context.Employees
.Include(fp => fp.JobRole) .Include(fp => fp.JobRole)
.Where(e => employeeIds.Contains(e.Id) && e.IsActive && e.TenantId == tenantId) .Where(e => employeeIds.Contains(e.Id) && e.JobRole != null && e.IsActive && e.TenantId == tenantId)
.Select(e => e.ToEmployeeVMFromEmployee()) .Distinct()
.Distinct() .ToListAsync();
.ToListAsync();
result = employees.Select(e => e.ToEmployeeVMFromEmployee()).ToList();
_logger.LogInfo("Employee list fetched using limited access (active only)."); _logger.LogInfo("Employee list fetched using limited access (active only).");
} }

6
Marco.Pms.Services/Helpers/EmployeeHelper.cs
View File

@ -85,12 +85,12 @@ namespace MarcoBMS.Services.Helpers
.Distinct() .Distinct()
.ToListAsync(); .ToListAsync();
result = await _context.Employees var employees = await _context.Employees
.Include(fp => fp.JobRole) .Include(fp => fp.JobRole)
.Where(e => employeeIds.Contains(e.Id) && e.IsActive && e.TenantId == tenantId) .Where(e => employeeIds.Contains(e.Id) && e.JobRole != null && e.IsActive && e.TenantId == tenantId)
.Select(e => e.ToEmployeeVMFromEmployee())
.Distinct() .Distinct()
.ToListAsync(); .ToListAsync();
result = employees.Select(e => e.ToEmployeeVMFromEmployee()).ToList();
} }
else if (ShowInActive) else if (ShowInActive)