From efaa2a7a5b7d9d1a36f4d6a7e275d2b76f6cd9d3 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期四, 06 八月 2026 18:06:09 +0800
Subject: [PATCH] 【景宁】查询随访任务组科室关联列表、查询随访任务组疾病关联列表

---
 ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml |   18 ++++++++++++++----
 1 files changed, 14 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 288be10..7f7e015 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
@@ -99,14 +99,24 @@
         WHERE r.del_flag = '0' and u.user_name = #{userName}
     </select>
 
-    <select id="checkRoleNameUnique" parameterType="String" resultMap="SysRoleResult">
+    <select id="checkRoleNameUnique" parameterType="com.ruoyi.common.core.domain.entity.SysRole" resultMap="SysRoleResult">
         <include refid="selectRoleVo"/>
-        where r.role_name=#{roleName} and r.del_flag = '0' limit 1
+        where r.role_name=#{roleName}
+        and r.del_flag = '0'
+        <if test="orgid != null and orgid != ''">
+            and r.orgid = #{orgid}
+        </if>
+        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