Merge branch 'master' into Main

2025-10-23 16:50:03 +03:30
parent 6a6e2e532a 3d86ba401f
commit d3cd7e5b3c
1 changed files with 3 additions and 2 deletions
--- a/CompanyManagment.EFCore/Repository/InstitutionContractRepository.cs
+++ b/CompanyManagment.EFCore/Repository/InstitutionContractRepository.cs
@@ -1330,8 +1330,9 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
                    Workshops = workshopDetails,
                    IsInPersonContract = x.contract.WorkshopGroup?.CurrentWorkshops
                        .Any(y=>y.Services.ContractInPerson)??true,
-                    IsOldContract = x.contract.WorkshopGroup?.CurrentWorkshops
-                        .Any(y=>y.Price == 0)??true
+                    IsOldContract = x.contract.WorkshopGroup?.CurrentWorkshops == null
+                                    || x.contract.WorkshopGroup.CurrentWorkshops.Count == 0
+                                    || x.contract.WorkshopGroup.CurrentWorkshops.Any(y => y.Price == 0)
                };
            }).ToList()
        };