root/THANASOFT-DV
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'fixes/fix-get-defunts-when-thanato-only' into staging

Browse Source
This commit is contained in:
Tiavina 2025-01-09 16:40:31 +03:00
commit 063669ede9
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gestion/lib/Db/Bdd.php
View File

@ -486,19 +486,18 @@ class Bdd {
$conditions = []; $conditions = [];
if($isUserThanatoOnly){ if($isUserThanatoOnly){
$thanato = $this->getThanatoByIdNextcloud($idNextcloud); $thanato = $this->getThanatoByIdNextcloud($idNextcloud);
if($thanato != null){ if($thanato == null){
return json_encode([]);
}
$thanatoId = $thanato["id"]; $thanatoId = $thanato["id"];
$defuntsIdRelatedToThanato = $this->getDefuntIdsRelatedToThanato($thanatoId); $defuntsIdRelatedToThanato = $this->getDefuntIdsRelatedToThanato($thanatoId);
if(!empty($defuntsIdRelatedToThanato)){ if(empty($defuntsIdRelatedToThanato)){
return json_encode([]);
}
$defuntListConditionPlaceholder = implode(',', array_fill(0, count($defuntsIdRelatedToThanato), '?')); $defuntListConditionPlaceholder = implode(',', array_fill(0, count($defuntsIdRelatedToThanato), '?'));
$conditions = $defuntsIdRelatedToThanato; $conditions = $defuntsIdRelatedToThanato;
$sql .= " WHERE ".$this->tableprefix."defunt.id IN ($defuntListConditionPlaceholder)"; $sql .= " WHERE ".$this->tableprefix."defunt.id IN ($defuntListConditionPlaceholder)";
} }
else{
return json_encode([]);
}
}
}
$sql .= " ORDER BY ".$this->tableprefix."defunt.id DESC;"; $sql .= " ORDER BY ".$this->tableprefix."defunt.id DESC;";
$defuntsList = $this->execSQLNoJsonReturn($sql,$conditions); $defuntsList = $this->execSQLNoJsonReturn($sql,$conditions);