admin/Backend-Api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix bug for extensions

Browse Source
This commit is contained in:
mahan
2026-01-24 19:10:24 +03:30
parent 3be1547137
commit 0134111aba
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CompanyManagment.EFCore/Repository/InstitutionContractRepository.cs
View File

@@ -2269,7 +2269,7 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
extenstionTemp extenstionTemp
); );
var workshopIds = prevInstitutionContracts.WorkshopGroup.CurrentWorkshops.Select(x => x.WorkshopId.Value); var workshopIds = prevInstitutionContracts.WorkshopGroup?.CurrentWorkshops?.Select(x => x.WorkshopId.Value)??[];
var workshopsNotInInstitution = employerWorkshopIds.Where(x => !workshopIds.Contains(x)).ToList(); var workshopsNotInInstitution = employerWorkshopIds.Where(x => !workshopIds.Contains(x)).ToList();
@@ -2277,7 +2277,7 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
.Where(x => workshopIds.Contains(x.id) || employerWorkshopIds.Contains(x.id)) .Where(x => workshopIds.Contains(x.id) || employerWorkshopIds.Contains(x.id))
.ToListAsync(); .ToListAsync();
var workshopDetails = prevInstitutionContracts.WorkshopGroup.CurrentWorkshops var workshopDetails = prevInstitutionContracts.WorkshopGroup?.CurrentWorkshops?
.Select(x => .Select(x =>
{ {
var workshop = workshops.FirstOrDefault(w => w.id == x.WorkshopId); var workshop = workshops.FirstOrDefault(w => w.id == x.WorkshopId);
@@ -2317,7 +2317,7 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
WorkshopId = workshop?.id ?? 0, WorkshopId = workshop?.id ?? 0,
RollCallInPerson = service.RollCallInPerson RollCallInPerson = service.RollCallInPerson
}; };
}).ToList(); }).ToList()??[];
var notIncludeWorskhopsLeftWork = await _context.LeftWorkList var notIncludeWorskhopsLeftWork = await _context.LeftWorkList
.Where(x => workshopsNotInInstitution.Contains(x.WorkshopId) && x.StartWorkDate <= DateTime.Now && .Where(x => workshopsNotInInstitution.Contains(x.WorkshopId) && x.StartWorkDate <= DateTime.Now &&
x.LeftWorkDate >= DateTime.Now) x.LeftWorkDate >= DateTime.Now)