Merge branch 'master' into develop

This commit is contained in:
Björn Fromme
2024-07-16 17:34:56 +02:00
13 changed files with 161 additions and 41 deletions
+6 -6
View File
@@ -137,17 +137,17 @@ class AssignmentRepository extends ServiceEntityRepository
;
}
if (null !== $jobProfile = $filterDto->getJobProfile()) {
if ($jobProfiles = $filterDto->getJobProfiles()) {
$qb
->andWhere($qb->expr()->eq('assignment.jobProfile', ':jobProfile'))
->setParameter('jobProfile', $jobProfile)
->andWhere($qb->expr()->in('assignment.jobProfile', ':jobProfiles'))
->setParameter('jobProfiles', $jobProfiles)
;
}
if (null !== $hotelCode = $filterDto->getHotel()) {
if ($hotelCodes = $filterDto->getHotels()) {
$qb
->andWhere($qb->expr()->eq('destination.hotelCode', ':hotelCode'))
->setParameter('hotelCode', $hotelCode)
->andWhere($qb->expr()->in('destination.hotelCode', ':hotelCodes'))
->setParameter('hotelCodes', $hotelCodes)
;
}