Commit 0c0640f4 authored by Jean-Philippe Metivier's avatar Jean-Philippe Metivier
Browse files

Fixing bug recherche EPro

parent f4cba6df

module/EntretienProfessionnel/src/EntretienProfessionnel/Service/EntretienProfessionnel/EntretienProfessionnelService.php

+3 −3
Changes for module/EntretienProfessionnel/src/EntretienProfessionnel/Service/EntretienProfessionnel/EntretienProfessionnelService.php: 3 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -548,9 +548,9 @@ class EntretienProfessionnelService { 
            $qb = $qb

                ->leftJoin('agent.affectations', 'affectation')->addSelect('affectation')

                ->leftJoin('affectation.structure', 'structure')->addSelect('structure')

                ->andWhere('structure.id = :etat')->setParameter('structure', $params['structure-filtre']['id'])

                ->andWhere('affectation.dateDebut IS NULL OR affectation.dateDebut <= entretien.date')

                ->andWhere('affectation.dateFin IS NULL OR affectation.dateFin >= entretien.date')

                ->andWhere('structure.id = :structure')->setParameter('structure', $params['structure-filtre']['id'])

                ->andWhere('affectation.dateDebut IS NULL OR affectation.dateDebut <= entretien.dateEntretien')

                ->andWhere('affectation.dateFin IS NULL OR affectation.dateFin >= entretien.dateEntretien')

                ->andWhere('affectation.id IS NOT NULL');

        }

        if ($params['agent-filtre'] !== null and $params['agent-filtre']['id'] !== "") {