From ca11d871c67ca9e1668193b95fbdc2bd9a18a280 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期二, 20 一月 2026 16:43:11 +0800
Subject: [PATCH] 【丽水】角色管理-校验功能增加orgid

---
 ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml |    9 +++++++--
 1 files changed, 7 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 288be10..00cdb17 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
@@ -104,9 +104,14 @@
         where r.role_name=#{roleName} and r.del_flag = '0' limit 1
     </select>
 
-    <select id="checkRoleKeyUnique" parameterType="String" resultMap="SysRoleResult">
+    <select id="checkRoleKeyUnique" parameterType="com.ruoyi.common.core.domain.entity.SysRole" resultMap="SysRoleResult">
         <include refid="selectRoleVo"/>
-        where r.role_key=#{roleKey} and r.del_flag = '0' limit 1
+        where r.role_key=#{roleKey}
+        and r.del_flag = '0'
+        <if test="orgid != null and orgid != ''">
+            and r.orgid = #{orgid}
+        </if>
+        limit 1
     </select>
 
     <insert id="insertRole" parameterType="SysRole" useGeneratedKeys="true" keyProperty="roleId">

--
Gitblit v1.9.3