diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/SettingAppController.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/SettingAppController.java
index eb3958f..40c67aa 100644
--- a/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/SettingAppController.java
+++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/SettingAppController.java
@@ -77,13 +77,13 @@ public class SettingAppController {
     }
 
 
-    @GetMapping("/areaCode/list")
-    @Operation(summary = "获取省市区编码接口")
-    @Log(title = "获取省市区编码接口", businessType = BusinessType.OTHER, isSaveDb = false)
-    public R<List<AreaCode>> listAreaCode(AreaCodeQuery query){
-        List<AreaCode> list = areaCodeService.listAreaCode(query);
-        return R.ok(list);
-    }
+//    @GetMapping("/areaCode/list")
+//    @Operation(summary = "获取省市区编码接口")
+//    @Log(title = "获取省市区编码接口", businessType = BusinessType.OTHER, isSaveDb = false)
+//    public R<List<AreaCode>> listAreaCode(AreaCodeQuery query){
+//        List<AreaCode> list = areaCodeService.listAreaCode(query);
+//        return R.ok(list);
+//    }
 
     @GetMapping("/areaCode/tree")
     @Operation(summary = "获取所有省市区编码")
diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/domain/AreaCode.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/domain/AreaCode.java
index 567da17..0f0acf4 100644
--- a/ruoyi-xq/src/main/java/com/ruoyi/xq/domain/AreaCode.java
+++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/domain/AreaCode.java
@@ -55,4 +55,19 @@ public class AreaCode implements Serializable {
      */
     private BigDecimal latitude;
 
+
+    public Integer getCityCode(){
+        if("city".equals(this.level)){
+            return this.code;
+        }
+        return pcode;
+    }
+
+    public String getCityName(){
+        if("city".equals(this.level)){
+            return this.name;
+        }
+        return pname;
+    }
+
 }
diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/job/JobManager.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/job/JobManager.java
index eb17b94..ea437b4 100644
--- a/ruoyi-xq/src/main/java/com/ruoyi/xq/job/JobManager.java
+++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/job/JobManager.java
@@ -71,8 +71,8 @@ public class JobManager {
                     if(areaCode != null){
                         updateFlag = true;
                         update.setResidenceName(areaCode.getFullname());
-                        update.setResidenceCityCode(areaCode.getPcode());
-                        update.setResidenceCityName(areaCode.getPname());
+                        update.setResidenceCityCode(areaCode.getCityCode());
+                        update.setResidenceCityName(areaCode.getCityName());
                     }
                 }
                 if(updateFlag){
diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/manager/CurrentUserManager.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/manager/CurrentUserManager.java
index bd26981..6b5cf81 100644
--- a/ruoyi-xq/src/main/java/com/ruoyi/xq/manager/CurrentUserManager.java
+++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/manager/CurrentUserManager.java
@@ -150,8 +150,8 @@ public class CurrentUserManager {
             AreaCode areaCode = areaCodeService.getById(req.getResidenceCode());
             updateUser.setResidenceCode(req.getResidenceCode());
             updateUser.setResidenceName(areaCode.getName());
-            updateUser.setResidenceCityCode(areaCode.getPcode());
-            updateUser.setResidenceCityName(areaCode.getPname());
+            updateUser.setResidenceCityCode(areaCode.getCityCode());
+            updateUser.setResidenceCityName(areaCode.getCityName());
         }
         if(req.getHeight() != null){
             updateUser.setHeight(req.getHeight());
diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/UserServiceImpl.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/UserServiceImpl.java
index 7ebc99f..a76d059 100644
--- a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/UserServiceImpl.java
+++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/UserServiceImpl.java
@@ -375,8 +375,8 @@ public class UserServiceImpl extends ServiceImpl<UserMapper,User> implements Use
             AreaCode areaCode = areaCodeService.getById(updateUserReq.getResidenceCode());
             updateUser.setResidenceCode(updateUserReq.getResidenceCode());
             updateUser.setResidenceName(areaCode.getFullname());
-            updateUser.setResidenceCityCode(areaCode.getPcode());
-            updateUser.setResidenceCityName(areaCode.getPname());
+            updateUser.setResidenceCityCode(areaCode.getCityCode());
+            updateUser.setResidenceCityName(areaCode.getCityName());
         }
         if(updateUserReq.getAddressCode() != null){
             AreaCode areaCode = areaCodeService.getById(updateUserReq.getAddressCode());