From c2c7ba39d8d29253c744ac26de6cbfc2cb48340c Mon Sep 17 00:00:00 2001 From: fomichev Date: Fri, 7 Feb 2025 14:47:47 +0300 Subject: [PATCH] =?utf8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB=D0=B5?= =?utf8?q?=D0=BD=D0=B8=D0=B5=20=D0=B7=D0=B0=D0=B3=D1=80=D1=83=D0=B7=D0=BA?= =?utf8?q?=D0=B8=20=D1=81=20parent=5Fid?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- erp24/controllers/StoreCityListController.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/erp24/controllers/StoreCityListController.php b/erp24/controllers/StoreCityListController.php index 256ae56d..f820ac04 100644 --- a/erp24/controllers/StoreCityListController.php +++ b/erp24/controllers/StoreCityListController.php @@ -98,8 +98,9 @@ class StoreCityListController extends Controller foreach ($data as $row) { $name = $row['name'] ?? $row['A']; - $parent_id = $row['parent_id'] ?? $row['B']; $type = $row['type'] ?? $row['C']; + $parent_id = isset($row['parent_id']) ? trim($row['parent_id']) : (isset($row['B']) ? trim($row['B']) : ''); + $parent_id = ($parent_id === '' || strtolower($parent_id) === 'null') ? null : (int)$parent_id; $existingRecord = StoreCityList::find() ->where(['name' => $name, 'parent_id' => $parent_id, 'type' => $type]) -- 2.39.5