From 4d0c84bcf59db6016d5a9e2a9a927448208d8fbf Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期四, 03 三月 2022 23:58:09 +0800
Subject: [PATCH] remove 删除多余引号

---
 ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml |   16 ++++++----------
 1 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index 8c2437e..ef968ad 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -9,6 +9,7 @@
         <result property="deptId" column="dept_id"/>
         <result property="userName" column="user_name"/>
         <result property="nickName" column="nick_name"/>
+        <result property="userType" column="user_type"/>
         <result property="email" column="email"/>
         <result property="phonenumber" column="phonenumber"/>
         <result property="sex" column="sex"/>
@@ -50,6 +51,7 @@
                u.dept_id,
                u.user_name,
                u.nick_name,
+               u.user_type,
                u.email,
                u.avatar,
                u.phonenumber,
@@ -98,11 +100,8 @@
         <if test="user.phonenumber != null and user.phonenumber != ''">
             AND u.phonenumber like concat('%', #{user.phonenumber}, '%')
         </if>
-        <if test="user.params.beginTime != null and user.params.beginTime != ''"><!-- 寮�濮嬫椂闂存绱� -->
-            AND date_format(u.create_time,'%y%m%d') &gt;= date_format(#{user.params.beginTime},'%y%m%d')
-        </if>
-        <if test="user.params.endTime != null and user.params.endTime != ''"><!-- 缁撴潫鏃堕棿妫�绱� -->
-            AND date_format(u.create_time,'%y%m%d') &lt;= date_format(#{user.params.endTime},'%y%m%d')
+        <if test="user.params.beginTime != null and user.params.endTime != null">
+            AND u.create_time between #{user.params.beginTime} and #{user.params.endTime}
         </if>
         <if test="user.deptId != null and user.deptId != 0">
             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},
@@ -128,11 +127,8 @@
         <if test="phonenumber != null and phonenumber != ''">
             AND u.phonenumber like concat('%', #{phonenumber}, '%')
         </if>
-        <if test="params.beginTime != null and params.beginTime != ''"><!-- 寮�濮嬫椂闂存绱� -->
-            AND date_format(u.create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
-        </if>
-        <if test="params.endTime != null and params.endTime != ''"><!-- 缁撴潫鏃堕棿妫�绱� -->
-            AND date_format(u.create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
+        <if test="params.beginTime != null and params.endTime != null">
+            AND u.create_time between #{params.beginTime} and #{params.endTime}
         </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 find_in_set(#{deptId},

--
Gitblit v1.9.3