From 689968ebc158eac2c1027952070940b30717cbed Mon Sep 17 00:00:00 2001
From: 77 <77@77.com>
Date: Wed, 10 Apr 2024 00:45:40 +0800
Subject: [PATCH] init

---
 ruoyi-xq/src/main/java/com/ruoyi/xq/domain/UserInfo.java    | 1 +
 .../com/ruoyi/xq/dto/app/user/UpdateUserFullInfoReq.java    | 6 +++---
 .../com/ruoyi/xq/dto/app/user/vo/CurrentUserFullInfoVo.java | 2 ++
 .../main/java/com/ruoyi/xq/dto/app/user/vo/HomeUserVo.java  | 3 +++
 .../main/java/com/ruoyi/xq/manager/CurrentUserManager.java  | 5 +++++
 5 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/domain/UserInfo.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/domain/UserInfo.java
index 1640997..1d32075 100644
--- a/ruoyi-xq/src/main/java/com/ruoyi/xq/domain/UserInfo.java
+++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/domain/UserInfo.java
@@ -119,6 +119,7 @@ public class UserInfo implements Serializable {
      * 择偶条件-地区
      */
     private String filterResidence;
+    private String filterResidenceCode;
     /**
      * 择偶条件-年收入
      */
diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/user/UpdateUserFullInfoReq.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/user/UpdateUserFullInfoReq.java
index 194894c..09a890a 100644
--- a/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/user/UpdateUserFullInfoReq.java
+++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/user/UpdateUserFullInfoReq.java
@@ -38,7 +38,7 @@ public class UpdateUserFullInfoReq {
     @Schema(description = "婚况")
     private Integer marriage;
     @Schema(description = "职业")
-    private Integer profession;
+    private String profession;
     @Schema(description = "年收入")
     private Integer annualIncome;
     @Schema(description = "公司性质")
@@ -86,8 +86,8 @@ public class UpdateUserFullInfoReq {
     private String filterMarriage;
     @Schema(description = "择偶条件-学历")
     private Integer filterEducation;
-    @Schema(description = "择偶条件-地区")
-    private String filterResidence;
+    @Schema(description = "择偶条件-地区Code")
+    private String filterResidenceCode;
     @Schema(description = "择偶条件-年收入")
     private Integer filterAnnualIncome;
     @Schema(description = "择偶条件-小孩情况")
diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/user/vo/CurrentUserFullInfoVo.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/user/vo/CurrentUserFullInfoVo.java
index f57f842..2489bf7 100644
--- a/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/user/vo/CurrentUserFullInfoVo.java
+++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/user/vo/CurrentUserFullInfoVo.java
@@ -215,6 +215,8 @@ public class CurrentUserFullInfoVo {
      */
     @Schema(description = "择偶条件-地区")
     private String filterResidence;
+    @Schema(description = "择偶条件-地区Code")
+    private String filterResidenceCode;
     /**
      * 择偶条件-年收入
      */
diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/user/vo/HomeUserVo.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/user/vo/HomeUserVo.java
index 3aa4ba2..4ed18f6 100644
--- a/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/user/vo/HomeUserVo.java
+++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/user/vo/HomeUserVo.java
@@ -206,6 +206,9 @@ public class HomeUserVo {
      */
     @Schema(description = "择偶条件-地区")
     private String filterResidence;
+
+    @Schema(description = "择偶条件-地区Code")
+    private String filterResidenceCode;
     /**
      * 择偶条件-年收入
      */
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 8cb6b4c..0aee00d 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
@@ -266,6 +266,11 @@ public class CurrentUserManager {
         userService.updateById(updateUser);
 
         UserInfo updateUserInfo = BeanConvertUtil.convertTo(req, UserInfo::new);
+        if(StringUtils.isNotEmpty(req.getFilterResidenceCode())){
+            AreaCode areaCode = areaCodeService.getById(req.getResidenceCode());
+            updateUserInfo.setFilterResidenceCode(req.getFilterResidenceCode());
+            updateUserInfo.setFilterResidence(areaCode.getFullname());
+        }
         UserInfo userInfo = userInfoService.getByUserId(userId);
         updateUserInfo.setId(userInfo.getId());
         updateUserInfo.setUpdateTime(LocalDateTime.now());