From d217ef37bf51c8208eac248dc8396de17cc5d30b Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期一, 28 三月 2022 14:26:01 +0800
Subject: [PATCH] update springboot 2.6.4 => 2.6.5 update springboot-admin 2.6.2 => 2.6.3 update hutool 5.7.21 => 5.7.22
---
ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml | 40 ++++------------------------------------
1 files changed, 4 insertions(+), 36 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
index 718dc3d..dc54c7e 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
@@ -39,46 +39,14 @@
left join sys_dept d on u.dept_id = d.dept_id
</sql>
- <select id="selectPageRoleList" parameterType="SysRole" resultMap="SysRoleResult">
+ <select id="selectPageRoleList" 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
+ ${ew.getCustomSqlSegment}
</select>
- <select id="selectRoleList" parameterType="SysRole" resultMap="SysRoleResult">
+ <select id="selectRoleList" 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
+ ${ew.getCustomSqlSegment}
</select>
<select id="selectRolePermissionByUserId" parameterType="Long" resultMap="SysRoleResult">
--
Gitblit v1.9.3