Merge branch 'fronkdev' into 'master'
Fixed PreorderModel WHERE clause adb_wohneinheit_id See merge request fronk/thetool!66
This commit is contained in:
@@ -384,24 +384,24 @@ class PreorderModel {
|
||||
if(array_key_exists("adb_hausnummer_id", $filter)) {
|
||||
$adb_hausnummer_id = $filter['adb_hausnummer_id'];
|
||||
if(is_numeric($adb_hausnummer_id)) {
|
||||
$where .= " AND adb_hausnummer_id=$adb_hausnummer_id";
|
||||
$where .= " AND tt_preorder.adb_hausnummer_id=$adb_hausnummer_id";
|
||||
} elseif(is_array($adb_hausnummer_id)) {
|
||||
$where .= " AND adb_hausnummer_id IN (".implode(",",$adb_hausnummer_id).")";
|
||||
$where .= " AND tt_preorder.adb_hausnummer_id IN (".implode(",",$adb_hausnummer_id).")";
|
||||
} elseif($adb_hausnummer_id === null) {
|
||||
$where .= " AND adb_hausnummer_id IS NULL";
|
||||
$where .= " AND tt_preorder.adb_hausnummer_id IS NULL";
|
||||
}
|
||||
}
|
||||
|
||||
if(array_key_exists("adb_wohneinheit_id", $filter)) {
|
||||
$adb_wohneinheit_id = $filter['adb_wohneinheit_id'];
|
||||
if(is_numeric($adb_wohneinheit_id)) {
|
||||
$where .= " AND adb_wohneinheit_id=$adb_wohneinheit_id";
|
||||
$where .= " AND tt_preorder.adb_wohneinheit_id=$adb_wohneinheit_id";
|
||||
} elseif(is_array($adb_wohneinheit_id)) {
|
||||
$where .= " AND adb_wohneinheit_id IN (".implode(",",$adb_wohneinheit_id).")";
|
||||
$where .= " AND tt_preorder.adb_wohneinheit_id IN (".implode(",",$adb_wohneinheit_id).")";
|
||||
} elseif($adb_wohneinheit_id === null) {
|
||||
$where .= " AND adb_wohneinheit_id IS NULL";
|
||||
$where .= " AND tt_preorder.adb_wohneinheit_id IS NULL";
|
||||
} elseif($adb_wohneinheit_id === true) {
|
||||
$where .= " AND adb_wohneinheit_id IS NOT NULL AND adb_wohneinheit_id > 0";
|
||||
$where .= " AND tt_preorder.adb_wohneinheit_id IS NOT NULL AND tt_preorder.adb_wohneinheit_id > 0";
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user