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/SysRoleMapper.xml |   24 +++++-------------------
 1 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
index 87bdc63..718dc3d 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
@@ -54,15 +54,8 @@
         <if test="role.roleKey != null and role.roleKey != ''">
             AND r.role_key like concat('%', #{role.roleKey}, '%')
         </if>
-        <if test="role.params.beginTime != null and role.params.beginTime != ''"><!-- 寮�濮嬫椂闂存绱� -->
-            and date_format(r.create_time,'%y%m%d') &gt;= date_format(#{role.params.beginTime},'%y%m%d')
-        </if>
-        <if test="role.params.endTime != null and role.params.endTime != ''"><!-- 缁撴潫鏃堕棿妫�绱� -->
-            and date_format(r.create_time,'%y%m%d') &lt;= date_format(#{role.params.endTime},'%y%m%d')
-        </if>
-        <!-- 鏁版嵁鑼冨洿杩囨护 -->
-        <if test="role.params.dataScope != null and role.params.dataScope != ''">
-            AND ( ${role.params.dataScope} )
+        <if test="role.params.beginTime != null and role.params.endTime != null">
+            AND r.create_time between #{role.params.beginTime} and #{role.params.endTime}
         </if>
         order by r.role_sort
     </select>
@@ -82,15 +75,8 @@
         <if test="roleKey != null and roleKey != ''">
             AND r.role_key like concat('%', #{roleKey}, '%')
         </if>
-        <if test="params.beginTime != null and params.beginTime != ''"><!-- 寮�濮嬫椂闂存绱� -->
-            and date_format(r.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(r.create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
-        </if>
-        <!-- 鏁版嵁鑼冨洿杩囨护 -->
-        <if test="params.dataScope != null and params.dataScope != ''">
-            AND ( ${params.dataScope} )
+        <if test="params.beginTime != null and params.endTime != null">
+            AND r.create_time between #{params.beginTime} and #{params.endTime}
         </if>
         order by r.role_sort
     </select>
@@ -100,7 +86,7 @@
         WHERE r.del_flag = '0' and ur.user_id = #{userId}
     </select>
 
-    <select id="selectRoleListByUserId" parameterType="Long" resultType="Integer">
+    <select id="selectRoleListByUserId" parameterType="Long" resultType="Long">
         select r.role_id
         from sys_role r
                  left join sys_user_role ur on ur.role_id = r.role_id

--
Gitblit v1.9.3