From 571e18289eb1517f77d77f4bf5da65cb21ea0a49 Mon Sep 17 00:00:00 2001
From: wangxy <1481820854@qq.com>
Date: Tue, 19 Nov 2024 09:45:54 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/system/SysConfigMapper.xml         |  4 +--
 .../mapper/system/SysDictTypeMapper.xml       |  5 ++--
 .../mapper/system/SysLogininforMapper.xml     |  4 +--
 .../mapper/system/SysOperLogMapper.xml        |  4 +--
 .../resources/mapper/system/SysRoleMapper.xml |  4 +--
 .../resources/mapper/system/SysUserMapper.xml |  4 +--
 .../resources/mapper/system/TdLeaveMapper.xml | 26 +++++++++----------
 7 files changed, 25 insertions(+), 26 deletions(-)

diff --git a/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml
index f33ad42..0f84e94 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml
@@ -51,10 +51,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 				AND config_key like concat('%', #{configKey}, '%')
 			</if>
 			<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
-				AND create_time &gt;= #{params.beginTime}
+				AND create_time &gt;= CAST(#{params.beginTime} AS TIMESTAMP)
 			</if>
 			<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
-				AND create_time &lt;= #{params.endTime}
+				AND create_time &lt;=  CAST(#{params.endTime} AS TIMESTAMP)
 			</if>
 		</where>
     </select>
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml
index 368f541..3b6fe9f 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml
@@ -33,12 +33,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 				AND dict_type like concat('%', #{dictType}, '%')
 			</if>
 			<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
-				AND create_time &gt;= #{params.beginTime}
+				and create_time &gt;= CAST(#{params.beginTime} AS TIMESTAMP)
 			</if>
 			<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
-				AND create_time &lt;= #{params.endTime}
+				and create_time &lt;=  CAST(#{params.endTime} AS TIMESTAMP)
 			</if>
-
 	    </where>
 	</select>
 	
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml
index 32bb4f3..9943c55 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml
@@ -34,10 +34,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 				AND login_name like concat('%', #{loginName}, '%')
 			</if>
 			<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
-				AND login_time &gt;= #{params.beginTime}
+				AND login_time &gt;= CAST(#{params.beginTime} AS TIMESTAMP)
 			</if>
 			<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
-				AND login_time &lt;= #{params.endTime}
+				AND login_time &lt;= CAST(#{params.endTime} AS TIMESTAMP)
 			</if>
 		</where>
 	</select>
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml
index 05bb57a..68c16f9 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml
@@ -56,10 +56,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 				AND oper_name like concat('%', #{operName}, '%')
 			</if>
 			<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
-				AND oper_time &gt;= #{params.beginTime}
+				AND oper_time &gt;= CAST(#{params.beginTime} AS TIMESTAMP)
 			</if>
 			<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
-				AND oper_time &lt;= #{params.endTime}
+				AND oper_time &lt;= CAST(#{params.endTime} AS TIMESTAMP)
 			</if>
 		</where>
 	</select>
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
index 353bb86..bcfcf72 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
@@ -52,10 +52,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			AND r.data_scope = #{dataScope}
 		</if>
 		<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
-			AND r.create_time &gt;= #{params.beginTime}
+			and  r.create_time &gt;= CAST(#{params.beginTime} AS TIMESTAMP)
 		</if>
 		<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
-			AND r.create_time &lt;= #{params.endTime}
+			and r.create_time &lt;=  CAST(#{params.endTime} AS TIMESTAMP)
 		</if>
 
 		<!-- 数据范围过滤 -->
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index 0f56dab..762a219 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -102,10 +102,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			AND u.phonenumber like concat('%', #{phonenumber}, '%')
 		</if>
 		<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
-			AND u.create_time &gt;= #{params.beginTime}
+			AND u.create_time &gt;= CAST(#{params.beginTime} AS TIMESTAMP)
 		</if>
 		<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
-			AND u.create_time &lt;= #{params.endTime}
+			AND u.create_time &lt;=  CAST(#{params.endTime} AS TIMESTAMP)
 		</if>
 		<if test="deptId != null and deptId != 0">
 			AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE CAST(#{deptId} AS text) = ANY(string_to_array(ancestors, ','))))
diff --git a/ruoyi-system/src/main/resources/mapper/system/TdLeaveMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TdLeaveMapper.xml
index d7d7666..4b760b0 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TdLeaveMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TdLeaveMapper.xml
@@ -27,19 +27,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectTdLeaveList" parameterType="TdLeave" resultMap="TdLeaveResult">
         <include refid="selectTdLeaveVo"/>
         <trim prefix="where" prefixOverrides="and|or">
-            <if test="userId != null  and userId != ''"> and u.user_id = #{userId}</if>
-            <if test="userName != null  and userName != ''"> and u.user_name like concat('%', #{userName}, '%')</if>
-            <if test="country != null  and country != ''"> and u.country = #{country}</if>
-            <if test="areaname != null  and areaname != ''"> and u.areaname like concat('%', #{areaname}, '%')</if>
-            <if test="leavereason != null  and leavereason != ''"> and u.leavereason = #{leavereason}</if>
-            <if test="depart != null  and depart != ''"> and u.depart = #{depart}</if>
-            <if test="leavedate != null "> and u.leavedate = #{leavedate}</if>
-            <if test="workstate != null  and workstate != ''"> and u.workstate = #{workstate}</if>
-            <if test="leavestate != null  and leavestate != ''"> and u.leavestate = #{leavestate}</if>
-            <if test="examinename != null  and examinename != ''"> and u.examinename like concat('%', #{examinename}, '%')</if>
-            <if test="examinedate != null "> and u.examinedate = #{examinedate}</if>
-            <if test="examinestate != null  and examinestate != ''"> and u.examinestate = #{examinestate}</if>
-            <if test="deptId != null  and deptId != ''"> and dept_id = #{deptId}</if>
+            <if test="userId != null  and userId != ''"> and d.user_id = #{userId}</if>
+            <if test="userName != null  and userName != ''"> and d.user_name like concat('%', #{userName}, '%')</if>
+            <if test="country != null  and country != ''"> and d.country = #{country}</if>
+            <if test="areaname != null  and areaname != ''"> and d.areaname like concat('%', #{areaname}, '%')</if>
+            <if test="leavereason != null  and leavereason != ''"> and d.leavereason = #{leavereason}</if>
+            <if test="depart != null  and depart != ''"> and d.depart = #{depart}</if>
+            <if test="leavedate != null "> and d.leavedate = #{leavedate}</if>
+            <if test="workstate != null  and workstate != ''"> and d.workstate = #{workstate}</if>
+            <if test="leavestate != null  and leavestate != ''"> and d.leavestate = #{leavestate}</if>
+            <if test="examinename != null  and examinename != ''"> and d.examinename like concat('%', #{examinename}, '%')</if>
+            <if test="examinedate != null "> and d.examinedate = #{examinedate}</if>
+            <if test="examinestate != null  and examinestate != ''"> and d.examinestate = #{examinestate}</if>
+            <if test="deptId != null  and deptId != ''"> and d.dept_id = #{deptId}</if>
             <!-- 数据范围过滤 -->
             ${params.dataScope}
         </trim>