diff --git a/module/Application/src/Service/AbstractEntityService.php b/module/Application/src/Service/AbstractEntityService.php index 010809b2757eb906dbd475c63ea9a214f616638f..1f407ad0bcd013ae037b777deba8855141255ffd 100755 --- a/module/Application/src/Service/AbstractEntityService.php +++ b/module/Application/src/Service/AbstractEntityService.php @@ -517,8 +517,8 @@ abstract class AbstractEntityService extends AbstractService if (!$structure){ $qb->andWhere("$alias.structure IS NULL"); }else{ - $qb->leftJoin("$alias.structure", 'strids'); - $qb->andWhere($e->like("strids.ids", $e->literal($structure->idsFilter()))); + $qb->leftJoin("$alias.structure", $alias.'strids'); + $qb->andWhere($e->like($alias."strids.ids", $e->literal($structure->idsFilter()))); } return $qb; diff --git a/module/Signature/src/Controller/SignatureFlowController.php b/module/Signature/src/Controller/SignatureFlowController.php index 01239f6962a4478b5900905059775d41f673c7cb..d54ad62bdf1ddd64725d3b17a6ba28cee9b29455 100644 --- a/module/Signature/src/Controller/SignatureFlowController.php +++ b/module/Signature/src/Controller/SignatureFlowController.php @@ -81,8 +81,13 @@ class SignatureFlowController extends AbstractController try{ $this->getServiceSignatureFlow()->delete($signatureFlow); }catch (\Exception $e){ - $this->flashMessenger()->addErrorMessage($e->getMessage()); - + if(str_contains($e->getMessage(), 'ORA-02292')) + { + $this->flashMessenger()->addErrorMessage('Vous ne pouvez pas supprimer ce circuit de signature, car vous avez déjà des signatures électroniques qui l\'utilisent'); + } + else{ + $this->flashMessenger()->addErrorMessage($e->getMessage()); + } } }