Commit 2c9e3b66 authored by Stephane Bouvry's avatar Stephane Bouvry
Browse files

Anomalie #23524 : Fix de l'exception lors d'une recherche vide avec le type... 

Anomalie #23524 : Fix de l'exception lors d'une recherche vide avec le type 'Tous' selectionné dans la liste des types d'organisation
parent 3d37a355

module/Oscar/src/Oscar/Service/OrganizationService.php

+17 −2
Changes for module/Oscar/src/Oscar/Service/OrganizationService.php: 17 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -280,15 +280,30 @@ class OrganizationService implements ServiceLocatorAwareInterface, EntityManager 
            }

        }



        // -------------------------------------------------------------------------------------------------------------

        // FILTRE sur les types d'organisations

        if (isset($filter['type']) && $filter['type']){



            // On purge les types vides (option "Tous")

            $cleanTypes = [];



            foreach ($filter['type'] as $typeValue) {

                if( $typeValue ){

                    $cleanTypes[] = $typeValue;

                }

            }



            if( count($cleanTypes) > 0 ){

                $types = $this->getEntityManager()->getRepository(OrganizationType::class)->createQueryBuilder('t')

                    ->where('t.id IN (:types)')

                ->setParameter('types', $filter['type'])

                    ->setParameter('types', $cleanTypes)

                    ->getQuery()

                    ->getResult();



                $qb->leftJoin('o.typeObj', 't')

                ->andWhere('t.id IN(:type)')->setParameter('type', $types);

                    ->andWhere('t.id IN(:type)')

                    ->setParameter('type', $types);

            }

        }



        if (isset($filter['active']) && $filter['active']){