Luca/thetool
1
0
Fork 0
Code Issues 5 Pull Requests 5 Actions Packages Projects Releases Wiki Activity

Merge branch 'fronkdev' into 'master'

Browse Source 
preorderaddressreporting user see all visibilites in AddressAPI

See merge request fronk/thetool!758
This commit is contained in:
Frank Schubert
2024-11-22 12:50:31 +00:00
parent 02ae370515 1dec1de189
commit 402de3673d
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
application/Api/v1/AddressdbApicontroller.php
View File

@@ -389,7 +389,9 @@ class AddressdbApicontroller extends mfBaseApicontroller {
if(count($this->filter_salescluster_ids)) {
$where .= " AND netzgebiet_id IN (" . implode(",", $this->filter_salescluster_ids) . ")";
}
$where .= " AND Hausnummer.visibility='public'";
if(!$this->me->is("preorderaddressreporting")) {
$where .= " AND Hausnummer.visibility='public'";
}
$sql = AddressDB::$wohneinheit_query;
$sql .= "\n WHERE $where AND ((" . implode(" OR ", $ort_search) . ") OR (" . implode(" OR ", $strasse_search) . ") OR (" . implode(" OR ", $plz_search) . ") OR (" . implode(" OR ", $hausnummer_search) . ")) ORDER BY strasse, LENGTH(hausnummer), hausnummer, LENGTH(`Wohneinheit`.tuer),`Wohneinheit`.tuer, zusatz, LENGTH(num), num";
@@ -681,7 +683,9 @@ class AddressdbApicontroller extends mfBaseApicontroller {
if($search_cluster_id) {
$where .= " AND Netzgebiet.extref='$search_cluster_id'";
}
$where .= " AND Hausnummer.visibility='public'";
if(!$this->me->is("preorderaddressreporting")) {
$where .= " AND Hausnummer.visibility='public'";
}
//echo $where;
//var_dump($this->filter_salescluster_ids);exit;