From 6d97965476e5dded42c32ee301a0006e7ef89f33 Mon Sep 17 00:00:00 2001
From: wangxy <1356089412@qq.com>
Date: Thu, 20 Jun 2024 15:04:28 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E7=BB=B4=E4=BF=AE=E5=95=86=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/system/user/userexamine/userexamine.html      | 6 +++---
 .../src/main/resources/mapper/system/SysUserMapper.xml      | 6 ++++++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/templates/system/user/userexamine/userexamine.html b/ruoyi-admin/src/main/resources/templates/system/user/userexamine/userexamine.html
index 46866df..cc93549 100644
--- a/ruoyi-admin/src/main/resources/templates/system/user/userexamine/userexamine.html
+++ b/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>
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index c50bde3..ae4cb9d 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/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>