diff --git a/application/ConstructionConsent/ConstructionConsent.php b/application/ConstructionConsent/ConstructionConsent.php index b20d3ebdf..da1c952a2 100644 --- a/application/ConstructionConsent/ConstructionConsent.php +++ b/application/ConstructionConsent/ConstructionConsent.php @@ -624,27 +624,27 @@ FROM ConstructionConsent if(array_key_exists("conduit_installed_building", $filter)) { $conduit_installed_building = $filter["conduit_installed_building"]; if($conduit_installed_building == "!NULL") { - $where .= " AND conduit_installed_building IS NOT NULL"; + $where .= " AND (conduit_installed_building IS NOT NULL AND conduit_installed_building != 0)"; } elseif($conduit_installed_building == "NULL") { - $where .= " AND conduit_installed_building IS NULL"; + $where .= " AND (conduit_installed_building IS NULL OR conduit_installed_building = 0)"; } } if(array_key_exists("conduit_installed_ftu", $filter)) { $conduit_installed_ftu = $filter["conduit_installed_ftu"]; if($conduit_installed_ftu == "!NULL") { - $where .= " AND conduit_installed_ftu IS NOT NULL"; + $where .= " AND (conduit_installed_ftu IS NOT NULL AND conduit_installed_ftu != 0)"; } elseif($conduit_installed_ftu == "NULL") { - $where .= " AND conduit_installed_ftu IS NULL"; + $where .= " AND (conduit_installed_ftu IS NULL OR conduit_installed_ftu = 0)"; } } if(array_key_exists("inhouse_cabling", $filter)) { $inhouse_cabling = $filter["inhouse_cabling"]; if($inhouse_cabling == "!NULL") { - $where .= " AND inhouse_cabling IS NOT NULL"; + $where .= " AND (inhouse_cabling IS NOT NULL AND inhouse_cabling != 0)"; } elseif($inhouse_cabling == "NULL") { - $where .= " AND inhouse_cabling IS NULL"; + $where .= " AND (inhouse_cabling IS NULL OR inhouse_cabling = 0)"; } }