Fixed not creating OAID in rimo-import when requested

This commit is contained in:
Frank Schubert
2025-01-15 18:12:14 +01:00
parent 9333f50c27
commit dcf3ebbea4
5 changed files with 80 additions and 3 deletions

View File

@@ -651,6 +651,7 @@ class AddressdbApicontroller extends mfBaseApicontroller {
}
$addresses = [];
$netzgebiete = ADBNetzgebietModel::getAll(true);
$where = "1=1";
@@ -699,6 +700,10 @@ class AddressdbApicontroller extends mfBaseApicontroller {
if($this->db()->num_rows($res)) {
$tmp_addresses = [];
while($data = $this->db()->fetch_object($res)) {
// never return addresses without OAID if OAID is required in Network
if((!$data->hausnummer_oaid || !$data->wohneinheit_oaid) && $netzgebiete[$data->netzgebiet_id]->unit_create_oaid) continue;
$address_key = $data->hausnummer_id;
if($this->hausnummer_add_zusatz) {
$address_key = $data->hausnummer_id . "-" . $data->zusatz;