From aeee76e94340fa0c8f6a33d71f1043b116b4e154 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期一, 08 八月 2022 09:25:13 +0800
Subject: [PATCH] 登录日志新增解锁账户功能
---
src/main/resources/mybatis/system/SysRoleMapper.xml | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mybatis/system/SysRoleMapper.xml b/src/main/resources/mybatis/system/SysRoleMapper.xml
index 183cb0b..20cf452 100644
--- a/src/main/resources/mybatis/system/SysRoleMapper.xml
+++ b/src/main/resources/mybatis/system/SysRoleMapper.xml
@@ -65,7 +65,7 @@
<include refid="selectRoleVo"/>
</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
@@ -85,12 +85,12 @@
<select id="checkRoleNameUnique" parameterType="String" resultMap="SysRoleResult">
<include refid="selectRoleVo"/>
- where r.role_name=#{roleName} limit 1
+ where r.role_name=#{roleName} and r.del_flag = '0' limit 1
</select>
<select id="checkRoleKeyUnique" parameterType="String" resultMap="SysRoleResult">
<include refid="selectRoleVo"/>
- where r.role_key=#{roleKey} limit 1
+ where r.role_key=#{roleKey} and r.del_flag = '0' limit 1
</select>
<insert id="insertRole" parameterType="SysRole" useGeneratedKeys="true" keyProperty="roleId">
--
Gitblit v1.9.3