diff --git a/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml b/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml
index 8f0c2690e..a7f2ce812 100644
--- a/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml
+++ b/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml
@@ -66,11 +66,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
AND lower(table_comment) like lower(concat('%', #{genTable.tableComment}, '%'))
-
- AND date_format(create_time,'%y%m%d') >= date_format(#{genTable.params.beginTime},'%y%m%d')
-
-
- AND date_format(create_time,'%y%m%d') <= date_format(#{genTable.params.endTime},'%y%m%d')
+
+ AND create_time between #{genTable.params.beginTime} and #{genTable.params.endTime}
@@ -86,11 +83,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
AND lower(table_comment) like lower(concat('%', #{genTable.tableComment}, '%'))
-
- AND date_format(create_time,'%y%m%d') >= date_format(#{genTable.params.beginTime},'%y%m%d')
-
-
- AND date_format(create_time,'%y%m%d') <= date_format(#{genTable.params.endTime},'%y%m%d')
+
+ AND create_time between #{genTable.params.beginTime} and #{genTable.params.endTime}
order by create_time desc
@@ -105,11 +99,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
AND lower(table_comment) like lower(concat('%', #{tableComment}, '%'))
-
- AND date_format(create_time,'%y%m%d') >= date_format(#{params.beginTime},'%y%m%d')
-
-
- AND date_format(create_time,'%y%m%d') <= date_format(#{params.endTime},'%y%m%d')
+
+ AND create_time between #{params.beginTime} and #{params.endTime}
@@ -125,11 +116,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
AND lower(table_comment) like lower(concat('%', #{tableComment}, '%'))
-
- AND date_format(create_time,'%y%m%d') >= date_format(#{params.beginTime},'%y%m%d')
-
-
- AND date_format(create_time,'%y%m%d') <= date_format(#{params.endTime},'%y%m%d')
+
+ AND create_time between #{params.beginTime} and #{params.endTime}
order by create_time desc
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml
index eebc0a774..3863f66da 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml
@@ -17,18 +17,6 @@
-
- select post_id,
- post_code,
- post_name,
- post_sort,
- status,
- create_by,
- create_time,
- remark
- from sys_post
-
-
@@ -78,11 +75,8 @@
AND r.role_key like concat('%', #{roleKey}, '%')
-
- and date_format(r.create_time,'%y%m%d') >= date_format(#{params.beginTime},'%y%m%d')
-
-
- and date_format(r.create_time,'%y%m%d') <= date_format(#{params.endTime},'%y%m%d')
+
+ AND r.create_time between #{params.beginTime} and #{params.endTime}
order by r.role_sort
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index 7f12db7f6..ef968ad32 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -100,11 +100,8 @@
AND u.phonenumber like concat('%', #{user.phonenumber}, '%')
-
- AND date_format(u.create_time,'%y%m%d') >= date_format(#{user.params.beginTime},'%y%m%d')
-
-
- AND date_format(u.create_time,'%y%m%d') <= date_format(#{user.params.endTime},'%y%m%d')
+
+ AND u.create_time between #{user.params.beginTime} and #{user.params.endTime}
AND (u.dept_id = #{user.deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{user.deptId},
@@ -130,11 +127,8 @@
AND u.phonenumber like concat('%', #{phonenumber}, '%')
-
- AND date_format(u.create_time,'%y%m%d') >= date_format(#{params.beginTime},'%y%m%d')
-
-
- AND date_format(u.create_time,'%y%m%d') <= date_format(#{params.endTime},'%y%m%d')
+
+ AND u.create_time between #{params.beginTime} and #{params.endTime}
AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{deptId},