diff --git a/module/DemandeExterne/src/Controller/DemandeExterneController.php b/module/DemandeExterne/src/Controller/DemandeExterneController.php index 246f267324b54e4bde0c15b05f69ccb4f06da30c..b9f653e2058b8f9f5b9109f6cec1e01625f8f719 100644 --- a/module/DemandeExterne/src/Controller/DemandeExterneController.php +++ b/module/DemandeExterne/src/Controller/DemandeExterneController.php @@ -62,7 +62,7 @@ class DemandeExterneController extends AbstractActionController use UploadFormAwareTrait; - public function traiterParamsFromQueries(array $fromQueries, array $etatsListe): array + public function traiterParamsFromQueries(array $fromQueries, ?array $etatsListe): array { $params = [ 'agent' => $this->getAgentService()->getAgent($fromQueries['agent-filtre']['id'] ?? null), @@ -91,7 +91,7 @@ class DemandeExterneController extends AbstractActionController public function indexAction(): ViewModel { - $params = $this->traiterParamsFromQueries($this->params()->fromQuery(), DemandeExterneEtats::ETATS_OUVERTS); + $params = $this->traiterParamsFromQueries($this->params()->fromQuery(), []); $demandes = $this->getDemandeExterneService()->getDemandesExternesWithFiltre($params); $etats = $this->getEtatTypeService()->getEtatsTypesByCategorieCode(DemandeExterneEtats::TYPE); diff --git a/module/DemandeExterne/src/Service/DemandeExterne/DemandeExterneService.php b/module/DemandeExterne/src/Service/DemandeExterne/DemandeExterneService.php index 7c86da3d27bfd35a85a2621300fa519f6bb4c95d..ce7f8acf9adafb2aced89ffd915ec1eae7ba6cb2 100644 --- a/module/DemandeExterne/src/Service/DemandeExterne/DemandeExterneService.php +++ b/module/DemandeExterne/src/Service/DemandeExterne/DemandeExterneService.php @@ -61,6 +61,8 @@ class DemandeExterneService if (!empty($etats)) { $qb = $qb->andWhere('decorateurEtatType.code in (:etats)') ->setParameter('etats', $etats); + } else { + $qb = $qb->andWhere('decorateurEtat.type IS NULL'); } return $qb; }