From 855c3082647ae2dd56139a785b14614933b7ed6a Mon Sep 17 00:00:00 2001
From: 77 <77@77.com>
Date: Sun, 14 Apr 2024 16:02:39 +0800
Subject: [PATCH] init

---
 ruoyi-xq/src/main/java/com/ruoyi/xq/domain/User.java        | 1 +
 .../main/java/com/ruoyi/xq/dto/app/user/HomePageReq.java    | 6 ++++--
 ruoyi-xq/src/main/resources/mapper/xq/UserMapper.xml        | 4 ++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/domain/User.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/domain/User.java
index c3d77bb..a49572f 100644
--- a/ruoyi-xq/src/main/java/com/ruoyi/xq/domain/User.java
+++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/domain/User.java
@@ -90,6 +90,7 @@ public class User implements Serializable {
      * 居住地代码
      */
     private String residenceCode;
+//    private String residenceCityCode;
     /**
      * 居住城市
      */
diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/user/HomePageReq.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/user/HomePageReq.java
index a7f7878..dbebe5c 100644
--- a/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/user/HomePageReq.java
+++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/user/HomePageReq.java
@@ -41,8 +41,10 @@ public class HomePageReq extends PageQuery {
     private Integer marriage;
     @Schema(description = "教育")
     private Integer education;
-    @Schema(description = "居住地")
-    private String residenceCode;
+//    @Schema(description = "居住地")
+//    private String residenceCode;
+    @Schema(description = "居住地城市中文")
+    private String residenceCodeStr;
     @Schema(description = "VIP查询限制")
     private VipQuery vipQuery;
 
diff --git a/ruoyi-xq/src/main/resources/mapper/xq/UserMapper.xml b/ruoyi-xq/src/main/resources/mapper/xq/UserMapper.xml
index c27bd9b..84ccfdb 100644
--- a/ruoyi-xq/src/main/resources/mapper/xq/UserMapper.xml
+++ b/ruoyi-xq/src/main/resources/mapper/xq/UserMapper.xml
@@ -55,8 +55,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="params.education != null">
             and t1.education = #{params.education}
         </if>
-        <if test="params.residenceCode != null and params.residenceCode != ''">
-            and t1.residence_code like concat(#{params.residenceCode},'%')
+        <if test="params.residenceCodeStr != null and params.residenceCodeStr != ''">
+            and t1.residence_city_name = #{params.residenceCodeStr}
         </if>
         <if test="params.vipQuery != null">
             <if test="params.vipQuery.profession != null and params.vipQuery.profession != ''">