Feature_Directory #90

Merged
vikas.nale merged 501 commits from Feature_Directory into main 2025-06-10 14:44:36 +00:00
Showing only changes of commit a6fc75f492 - Show all commits

View File

@ -2694,7 +2694,7 @@ namespace Marco.Pms.Services.Helpers
}
var employeeBuckets = await _context.EmployeeBucketMappings.Where(eb => eb.BucketId == bucketId).ToListAsync();
var bucketIds = employeeBuckets.Where(eb => eb.EmployeeId == LoggedInEmployee.Id).Select(eb => eb.BucketId).ToList();
var employeeBucketIds = employeeBuckets.Select(eb => eb.EmployeeId).ToList();
Bucket? accessableBucket = null;
if (permissionIds.Contains(directoryAdmin))
{
@ -2723,7 +2723,7 @@ namespace Marco.Pms.Services.Helpers
{
if (employeeIds.Contains(assignBucket.EmployeeId))
{
if (assignBucket.IsActive)
if (assignBucket.IsActive && !employeeBucketIds.Contains(assignBucket.EmployeeId))
{
EmployeeBucketMapping employeeBucketMapping = new EmployeeBucketMapping
{