From 02d31465d4f1fc87d2c323b49434ebed9bddd0aa Mon Sep 17 00:00:00 2001
From: sa0ChunLuyu <sa0Chun_luyu@aliyun.com>
Date: Tue, 29 Oct 2024 16:41:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20=E5=A9=9A=E6=A3=80?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=20=E5=8C=B9=E9=85=8D=E5=87=BA=E7=94=9F?=
 =?UTF-8?q?=E5=9C=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/API/H5/UserController.php     | 51 ++++++++++++-------
 1 file changed, 34 insertions(+), 17 deletions(-)

diff --git a/Laravel/app/Http/Controllers/API/H5/UserController.php b/Laravel/app/Http/Controllers/API/H5/UserController.php
index 5d97471..05a3533 100644
--- a/Laravel/app/Http/Controllers/API/H5/UserController.php
+++ b/Laravel/app/Http/Controllers/API/H5/UserController.php
@@ -101,23 +101,6 @@ class UserController extends Controller
           }
         }
       }
-
-      if (count($address_array) == 0) {
-        $address_array = [
-          [
-            'value' => '11',
-            'text' => '北京市'
-          ],
-          [
-            'value' => '1101',
-            'text' => '市辖区'
-          ],
-          [
-            'value' => '110101',
-            'text' => '东城区'
-          ],
-        ];
-      }
       $id_number = $res['ID_No'] ?? '';
       $birthplace = '';
       if ($id_type_show == 0 && mb_strlen($id_number, 'utf-8') == 18) {
@@ -135,6 +118,22 @@ class UserController extends Controller
                 foreach ($aav['children'] as $aaak => $aaav) {
                   if ($aaav['code'] == $xian) {
                     $birthplace = $birthplace . $aaav['name'];
+                    if (count($address_array) == 0) {
+                      $address_array = [
+                        [
+                          'value' => $av['code'],
+                          'text' => $av['name'],
+                        ],
+                        [
+                          'value' => $aav['code'],
+                          'text' => $aav['name']
+                        ],
+                        [
+                          'value' => $aaav['code'],
+                          'text' => $aaav['name']
+                        ],
+                      ];
+                    }
                     break;
                   }
                 }
@@ -145,6 +144,24 @@ class UserController extends Controller
           }
         }
       }
+
+      if (count($address_array) == 0) {
+        $address_array = [
+          [
+            'value' => '11',
+            'text' => '北京市'
+          ],
+          [
+            'value' => '1101',
+            'text' => '市辖区'
+          ],
+          [
+            'value' => '110101',
+            'text' => '东城区'
+          ],
+        ];
+      }
+
       $person_info  = [
         '国籍' => $res['MZ'] == '外国血统' ? '外国' : '中国',
         '证件类型' => $id_type_show,