feat:维修商页面调整

ruoyi-admin/src/main/resources/templates/system/user/userexamine/userexamine.html

@@ -13,14 +13,14 @@
                         <li>
                             <label>人员状态：</label>
                             <select name="status" th:with="type=${@dict.getType('sys_normal_disable')}">
-                                <option value="">所有</option>
+                                <option value="">---请选择---</option>
                                 <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                             </select>
                         </li>
                         <li>
                             <label>审核状态：</label>
-                            <select name="trainState" th:with="type=${@dict.getType('sys_examine_state')}">
-                                <option value="">所有</option>
+                            <select name="examine" th:with="type=${@dict.getType('sys_examine_state')}">
+                                <option value="">---请选择---</option>
                                 <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                             </select>
                         </li>

ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -83,9 +83,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<if test="loginName != null and loginName != ''">
 			AND u.login_name like concat('%', #{loginName}, '%')
 		</if>
+		<if test="userName != null and userName != ''">
+			AND u.user_name like concat('%', #{userName}, '%')
+		</if>
 		<if test="status != null and status != ''">
 			AND u.status = #{status}
 		</if>
+		<if test="examine != null and examine != ''">
+			AND u.examine = #{examine}
+		</if>
 		<if test="phonenumber != null and phonenumber != ''">
 			AND u.phonenumber like concat('%', #{phonenumber}, '%')
 		</if>