From 5acc1059c1f2011060465573d1aa1fccee3f60a9 Mon Sep 17 00:00:00 2001
From: zhou-hongcheng <1064771933@qq.com>
Date: Fri, 6 Feb 2026 11:12:39 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A7=E4=B8=BB=E7=AE=A1=E7=90=86=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/mhd/user/interfaces/dto/addDTO/UserDTO.java   |  6 ++++++
 .../src/main/resources/mapper/UserMapper.xml          | 11 +++--------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/mhd-user-center/src/main/java/com/mhd/user/interfaces/dto/addDTO/UserDTO.java b/mhd-user-center/src/main/java/com/mhd/user/interfaces/dto/addDTO/UserDTO.java
index 39e50a0e9..08c26f52e 100644
--- a/mhd-user-center/src/main/java/com/mhd/user/interfaces/dto/addDTO/UserDTO.java
+++ b/mhd-user-center/src/main/java/com/mhd/user/interfaces/dto/addDTO/UserDTO.java
@@ -241,4 +241,10 @@ public class UserDTO extends BaseVOEntity {
 
     @ApiModelProperty( "制单员nc编码")
     private String documentPreparerNcCode;
+
+    @ApiModelProperty(value = "紧急联系人姓名")
+    private String emergencyContactName;
+
+    @ApiModelProperty(value = "紧急联系电话")
+    private String emergencyContactPhone;
 }
diff --git a/mhd-user-center/src/main/resources/mapper/UserMapper.xml b/mhd-user-center/src/main/resources/mapper/UserMapper.xml
index b88767ad9..ad56a81f1 100644
--- a/mhd-user-center/src/main/resources/mapper/UserMapper.xml
+++ b/mhd-user-center/src/main/resources/mapper/UserMapper.xml
@@ -406,14 +406,6 @@
         <if test="userMemberCode != null and userMemberCode != ''">
          and a.user_member_code = #{userMemberCode}
          </if>
-        /*联系人*/
-        <if test="emergencyContactName != null and emergencyContactName != ''">
-            and a.emergency_contact_name = #{emergencyContactName}
-        </if>
-        /*联系电话*/
-        <if test="emergencyContactPhone != null and emergencyContactPhone != ''">
-            and a.emergency_contact_phone = #{emergencyContactPhone}
-        </if>
         /*详细地址*/
         <if test="userAreaAddress != null  and userAreaAddress != ''">
             and a.user_area_address like concat('%' , #{userAreaAddress} , '%')
@@ -426,6 +418,9 @@
         <if test="emergencyContactPhone != null  and emergencyContactPhone != ''">
             and a.emergency_contact_phone like concat('%' , #{emergencyContactPhone} , '%')
         </if>
+        <if test="userAreaCountyId != null  and userAreaCountyId != ''">
+            and a.user_area_county_id = #{userAreaCountyId}
+        </if>
     </sql>
 
     <select id="selectAppUserList" resultType="com.mhd.common.core.domain.po.app.UserAppPo" parameterType="com.mhd.user.domain.userAggregate.repository.todo.UserDO">