From 7ac0ca07177374b7c7d79a0680723cc64a6573c6 Mon Sep 17 00:00:00 2001
From: 20918 <2091823062@qq.com>
Date: Tue, 16 Apr 2024 10:23:24 +0800
Subject: [PATCH] userexamine

---
 ruoyi-admin/src/main/resources/static/i18n/messages.properties  | 2 +-
 ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/ruoyi-admin/src/main/resources/static/i18n/messages.properties b/ruoyi-admin/src/main/resources/static/i18n/messages.properties
index 408552c..316e097 100644
--- a/ruoyi-admin/src/main/resources/static/i18n/messages.properties
+++ b/ruoyi-admin/src/main/resources/static/i18n/messages.properties
@@ -6,7 +6,7 @@ user.password.not.match=用户不存在/密码错误
 user.password.retry.limit.count=密码输入错误{0}次
 user.password.retry.limit.exceed=密码输入错误{0}次，帐户锁定10分钟
 user.password.delete=对不起，您的账号已被删除
-user.examine.disabled=抱歉，你的用户未经过审核
+user.examine.disabled=抱歉，你的用户未经过审核或正在审核，请联系管理员
 user.blocked=用户已封禁，请联系管理员
 role.blocked=角色已封禁，请联系管理员
 login.blocked=很遗憾，访问IP已被列入系统黑名单
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index c9a2050..867ac58 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -235,6 +235,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="politics != null">politics,</if>
 			<if test="shemichengdu != null">shemichengdu,</if>
 			<if test="graduate != null">graduate,</if>
+			<if test="startdate != null">startdate,</if>
+			<if test="enddate != null">enddate,</if>
 			<if test="helthy != null">helthy,</if>
 			<if test="examine != null">examine,</if>
 			<if test="examineuser != null">examineuser,</if>