From 8f7873039b38619b18e4b3feb1b7eb4e68f99608 Mon Sep 17 00:00:00 2001
From: yaooo <272523191@qq.com>
Date: Mon, 7 Aug 2023 14:10:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BF=9D=E5=AD=98=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/api/user/UserAddress.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/controller/api/user/UserAddress.php b/app/controller/api/user/UserAddress.php
index 8169652f..307b7764 100644
--- a/app/controller/api/user/UserAddress.php
+++ b/app/controller/api/user/UserAddress.php
@@ -141,16 +141,16 @@ class UserAddress extends BaseController
         $data['district'] = $district['name'];
         $data['district_id'] = $district['id'];
         if (isset($street)) {
-            $data['street'] = $street['name'];
-            $data['street_id'] = $street['id'];
+            $data['street'] = $street['name'] ?? '';
+            $data['street_id'] = $street['id'] ?? 0;
         }
         if (isset($village)) {
-            $data['village'] = $village['name'];
-            $data['village_id'] = $village['id'];
+            $data['village'] = $village['name'] ?? '';
+            $data['village_id'] = $village['id'] ?? 0;
         }
         if (isset($brigade)) {
-            $data['brigade'] = $brigade['name'];
-            $data['brigade_id'] = $brigade['id'];
+            $data['brigade'] = $brigade['name'] ?? '';
+            $data['brigade_id'] = $brigade['id'] ?? 0;
         }
         unset($data['area']);
         return $data;