From 5188d56b4aa85743b10ef4feb595295ad5cb9b90 Mon Sep 17 00:00:00 2001 From: 若依 <yzz_ivy@163.com> Date: 星期六, 18 九月 2021 18:41:03 +0800 Subject: [PATCH] !321 修复 全局限流key会多出一个"-" 将其移动到IP后面 去除多余的空格 Merge pull request !321 from 疯狂的狮子Li/N/A --- ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml index 243ce82..c26cfe5 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml @@ -33,6 +33,9 @@ <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> @@ -133,10 +136,6 @@ update_time = sysdate() </set> where role_id = #{roleId} - </update> - - <update id="updateRoleStatus" parameterType="SysRole"> - update sys_user set status = #{status} where user_id = #{userId} </update> <delete id="deleteRoleById" parameterType="Long"> -- Gitblit v1.9.2