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 | 46 ++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 44 insertions(+), 2 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
index 9362ebc..718dc3d 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
@@ -39,12 +39,54 @@
left join sys_dept d on u.dept_id = d.dept_id
</sql>
+ <select id="selectPageRoleList" parameterType="SysRole" resultMap="SysRoleResult">
+ <include refid="selectRoleVo"/>
+ where r.del_flag = '0'
+ <if test="role.roleId != null and role.roleId != 0">
+ AND r.role_id = #{role.roleId}
+ </if>
+ <if test="role.roleName != null and role.roleName != ''">
+ AND r.role_name like concat('%', #{role.roleName}, '%')
+ </if>
+ <if test="role.status != null and role.status != ''">
+ AND r.status = #{role.status}
+ </if>
+ <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.endTime != null">
+ AND r.create_time between #{role.params.beginTime} and #{role.params.endTime}
+ </if>
+ order by r.role_sort
+ </select>
+
+ <select id="selectRoleList" parameterType="SysRole" resultMap="SysRoleResult">
+ <include refid="selectRoleVo"/>
+ where r.del_flag = '0'
+ <if test="roleId != null and roleId != 0">
+ AND r.role_id = #{roleId}
+ </if>
+ <if test="roleName != null and roleName != ''">
+ AND r.role_name like concat('%', #{roleName}, '%')
+ </if>
+ <if test="status != null and status != ''">
+ AND r.status = #{status}
+ </if>
+ <if test="roleKey != null and roleKey != ''">
+ AND r.role_key like concat('%', #{roleKey}, '%')
+ </if>
+ <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>
+
<select id="selectRolePermissionByUserId" parameterType="Long" resultMap="SysRoleResult">
<include refid="selectRoleVo"/>
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
@@ -57,4 +99,4 @@
WHERE r.del_flag = '0' and u.user_name = #{userName}
</select>
-</mapper>
\ No newline at end of file
+</mapper>
--
Gitblit v1.9.3