货主管理查询条件优化

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;
 }

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">