From 4299048ed4f2b5e713dc43fd0e25901b4c72d703 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Fri, 03 Nov 2023 11:24:39 +0800
Subject: [PATCH] 角色权限控制接口调整

---
 src/main/java/org/springblade/modules/system/mapper/RoleMapper.xml |   27 +++++++++++++++++++++++++++
 1 files changed, 27 insertions(+), 0 deletions(-)

diff --git a/src/main/java/org/springblade/modules/system/mapper/RoleMapper.xml b/src/main/java/org/springblade/modules/system/mapper/RoleMapper.xml
index 9dc151f..57e1edd 100644
--- a/src/main/java/org/springblade/modules/system/mapper/RoleMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/RoleMapper.xml
@@ -26,6 +26,7 @@
 
     <select id="tree" resultMap="treeNodeResultMap">
         select id, parent_id, role_name as title, id as "value", id as "key" from blade_role where is_deleted = 0
+        and id!=1123598816738675201
         <if test="param1!=null">
             and tenant_id = #{param1}
         </if>
@@ -67,4 +68,30 @@
         </foreach>
     </select>
 
+    <!--角色查询-->
+    <select id="getRoleList" resultType="org.springblade.modules.system.entity.Role">
+        SELECT br.* FROM blade_role br
+        inner join (
+        SELECT * FROM
+        (
+        SELECT t1.*,IF( find_in_set( parent_id, @pids ) > 0, @pids := concat( @pids, ',', id ), 0 ) AS ischild FROM
+        ( SELECT id, parent_id,role_name,role_alias FROM blade_role t where is_deleted =0 ORDER BY parent_id, id ) t1,
+        ( SELECT @pids := #{roleParam.roleId} ) t2
+        ) t3
+        WHERE id != 1123598816738675201
+        <if test="roleParam.roleName!=null and roleParam.roleName!=''">
+            and role_name like concat('%',#{roleParam.roleName},'%')
+        </if>
+        <if test="roleParam.roleAlias!=null and roleParam.roleAlias!=''">
+            and role_alias like concat('%',#{roleParam.roleAlias},'%')
+        </if>
+        ) t4 on br.id = t4.id
+        <if test="roleParam.isNowLevel==0">
+            union all
+            (
+            SELECT * FROM blade_role where id = #{roleParam.roleId}
+            )
+        </if>
+    </select>
+
 </mapper>

--
Gitblit v1.9.3