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

Resloved the issue #1125

Browse Source
This commit is contained in:
ashutosh.nehete 2025-09-18 11:33:59 +05:30
parent e1b045f852
commit d9e0c2ee57
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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)