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

Feature_Directory #90

Merged
vikas.nale merged 501 commits from Feature_Directory into main 2025-06-10 14:44:36 +00:00
Conversation 0 Commits 501 Files Changed 60 +2 -2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 591b54c901 - Show all commits

4
Marco.Pms.Services/Helpers/DirectoryHelper.cs
View File

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