From a7f23600e19d8fe379b36442e8451e88e12daac2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=AD=90=E8=B4=A4?= <wzx1398745498@gmail.com>
Date: Mon, 24 Nov 2025 12:03:19 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BC=98=E5=8C=96=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/controller/mine/edit_info_controller.dart | 45 ++++++++++---------
 1 file changed, 25 insertions(+), 20 deletions(-)

diff --git a/lib/controller/mine/edit_info_controller.dart b/lib/controller/mine/edit_info_controller.dart
index 509f282..765fd38 100644
--- a/lib/controller/mine/edit_info_controller.dart
+++ b/lib/controller/mine/edit_info_controller.dart
@@ -263,10 +263,15 @@ class EditInfoController extends GetxController {
     //   text: height.value,
     //   selection: TextSelection.fromPosition(TextPosition(offset: height.value.length)),
     // );
-    location.value = "${userData.value?.provinceName}-${userData.value?.cityName}-${userData.value?.districtName}";
-    locationValue.value = [userData.value?.provinceCode, userData.value?.cityCode, userData.value?.districtCode];
-    homeLocation.value = "${userData.value?.hometownProvinceName}-${userData.value?.hometownCityName}";
-    homeLocationValue.value = [userData.value?.hometownProvinceCode, userData.value?.hometownCityCode];
+    if(userData.value?.provinceName != "" && userData.value?.cityName != "" && userData.value?.districtName != "" && userData.value?.provinceName != null && userData.value?.cityName != null && userData.value?.districtName != null){
+      location.value = "${userData.value?.provinceName}-${userData.value?.cityName}-${userData.value?.districtName}";
+      locationValue.value = [userData.value?.provinceCode, userData.value?.cityCode, userData.value?.districtCode];
+    }
+
+    if(userData.value?.hometownProvinceName != "" && userData.value?.hometownCityName != "" && userData.value?.hometownProvinceName != null && userData.value?.hometownCityName != null){
+      homeLocation.value = "${userData.value?.hometownProvinceName}-${userData.value?.hometownCityName}";
+      homeLocationValue.value = [userData.value?.hometownProvinceCode, userData.value?.hometownCityCode];
+    }
   }
 
   goPreview() async {
@@ -584,24 +589,24 @@ class EditInfoController extends GetxController {
       final payload = {
         'birthDate': userData.value?.birthDate ?? "",
         'birthYear': userData.value?.birthYear ?? "",
-        'provinceCode': locationValue[0],
-        'provinceName': location.value.split("-")[0],
-        'cityCode': locationValue[1],
-        'cityName': location.value.split("-")[1],
-        'districtCode': locationValue[2],
-        'districtName': location.value.split("-")[2],
+        'provinceCode': locationValue.length >= 3 ? locationValue[0] : "",
+        'provinceName': location.value != "" ? location.value.split("-")[0] : "",
+        'cityCode': locationValue.length >= 3 ? locationValue[1] : "",
+        'cityName': location.value != "" ? location.value.split("-")[1] : "",
+        'districtCode': locationValue.length >= 3 ? locationValue[2] : "",
+        'districtName': location.value != "" ? location.value.split("-")[2] : "",
         "educationCode": educationList[educationSelect.value].value,
-        "height": heightList[heightSelect.value],
-        'hometownProvinceCode': homeLocationValue[0],
-        'hometownProvinceName': homeLocation.value.split("-")[0],
-        'hometownCityCode': homeLocationValue[1],
-        'hometownCityName': homeLocation.value.split("-")[1],
-        "incomeCode": incomeList[incomeSelect.value].value,
-        "maritalStatusCode": maritalList[maritalSelect.value].value,
+        "height": heightSelect.value != -1 ? heightList[heightSelect.value] : "",
+        'hometownProvinceCode': homeLocationValue.length >= 2 ? homeLocationValue[0] : "",
+        'hometownProvinceName': homeLocation.value != "" ? homeLocation.value.split("-")[0] : "",
+        'hometownCityCode': homeLocationValue.length >= 2 ? homeLocationValue[1] : "",
+        'hometownCityName': homeLocation.value != "" ? homeLocation.value.split("-")[1] : "",
+        "incomeCode": incomeSelect.value != -1 ? incomeList[incomeSelect.value].value : "",
+        "maritalStatusCode": maritalSelect.value != -1 ? maritalList[maritalSelect.value].value : "",
         "nickName": userData.value?.nickName ?? "",
-        'occupation': occupation.value.split("-")[1],
-        'occupationCode': occupationValue[1],
-        "propertyPermitsCode": propertyList[propertySelect.value].value,
+        'occupation': occupation.value != "" ? occupation.value.split("-")[1] : "",
+        'occupationCode': occupationValue.length >= 2 ? occupationValue[1] : "",
+        "propertyPermitsCode": propertySelect.value != -1 ? propertyList[propertySelect.value].value : "",
 
       };