diff --git a/CompanyManagment.Application/InstitutionContractApplication.cs b/CompanyManagment.Application/InstitutionContractApplication.cs index 2e3e354c..fbba0187 100644 --- a/CompanyManagment.Application/InstitutionContractApplication.cs +++ b/CompanyManagment.Application/InstitutionContractApplication.cs @@ -1570,9 +1570,7 @@ public class InstitutionContractApplication : IInstitutionContractApplication createdWorkshop.InstitutionContractWorkshopGroupId,createdWorkshop.WorkshopGroup, createdWorkshop.WorkshopId!.Value, createdWorkshop.id); institutionContract.WorkshopGroup.AddCurrentWorkshop(currentWorkshop); - - - + } if (institutionContract.WorkshopGroup.InitialWorkshops.All(x => x.WorkshopCreated && x.WorkshopId is > 0)) diff --git a/CompanyManagment.EFCore/Repository/PlanPercentageRepository.cs b/CompanyManagment.EFCore/Repository/PlanPercentageRepository.cs index fcfc1eb6..0c2aa1d4 100644 --- a/CompanyManagment.EFCore/Repository/PlanPercentageRepository.cs +++ b/CompanyManagment.EFCore/Repository/PlanPercentageRepository.cs @@ -342,10 +342,12 @@ public class PlanPercentageRepository : RepositoryBase, IP .Select(x => x.ItemValue).FirstOrDefault(); var plans = _context.InstitutionPlans.AsQueryable(); + if (searchModel.CountPeron > 0) plans = plans.Where(x => x.CountPerson == searchModel.CountPeron); - + var count = await plans.CountAsync(); + var planQueryFilter =await plans.ApplyPagination(searchModel.PageIndex, searchModel.PageSize).ToListAsync(); var planResult = planQueryFilter.Select(plan => new InstitutionPlanViewModel