From 186c04d90a5ed5891ede09bcebc35141b22a652b Mon Sep 17 00:00:00 2001
From: 若依 <yzz_ivy@163.com>
Date: 星期一, 10 十月 2022 09:20:41 +0800
Subject: [PATCH] !595 解决导出时包含空子列表数据异常的问题 Merge pull request !595 from 也曾为你、像超人/N/A
---
ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
index a8d3ede..12e7f78 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
@@ -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">
@@ -139,7 +139,7 @@
</update>
<delete id="deleteRoleById" parameterType="Long">
- update sys_role set del_flag = '2' where role_id = #{roleId}
+ update sys_role set del_flag = '2' where role_id = #{roleId}
</delete>
<delete id="deleteRoleByIds" parameterType="Long">
--
Gitblit v1.9.2