用户修改

urbanLifelineServ/system/src/main/resources/mapper/user/TbSysUserMapper.xml

@@ -153,7 +153,7 @@
     </select>
 
     <!-- 根据条件查询用户列表 -->
-    <select id="getUserByFilter" resultMap="UserVOResultMap" parameterType="org.xyzh.common.dto.sys.TbSysUserDTO">
+    <select id="getUserByFilter" resultMap="UserVOResultMap">
         SELECT
             u.user_id, u.username, u.password, u.email, u.phone, u.wechat_id, u.status, u.user_type,
             u.optsn, u.creator, u.updater, u.dept_path, u.remark, u.create_time, u.update_time, u.delete_time, u.deleted,
@@ -170,9 +170,15 @@
             <if test="filter.phone != null and filter.phone != ''">
                 AND u.phone = #{filter.phone}
             </if>
+            <if test="filter.phoneHash != null and filter.phoneHash != ''">
+                AND u.phone_hash = #{filter.phoneHash}
+            </if>
             <if test="filter.status != null and filter.status != ''">
                 AND u.status = #{filter.status}
             </if>
+            <if test="filter.username !=null and filter.username !=''">
+                AND ui.username = #{filter.username}
+            </if>
             <!-- username / userType / deptPath 在表中不存在，按 SQL 为准移除相关条件 -->
             AND (u.deleted IS NULL OR u.deleted = false)
         </where>