From bdeb1fbd8a7933b8425bbed2b0093dfa1c2b4d3e Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Mon, 15 May 2023 19:23:24 +0800
Subject: [PATCH] 菜单，角色查询调整排序
---
skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/mapper/RoleMapper.xml | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/mapper/RoleMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/mapper/RoleMapper.xml
index 0ff576c..885a839 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/mapper/RoleMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/mapper/RoleMapper.xml
@@ -26,14 +26,26 @@
<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
- <if test="param1!=null">
+ <if test="param1!=null and param1!=''">
and tenant_id = #{param1}
</if>
- <if test="param2!=null">
+ <if test="param2!=null and param2!=''">
and role_alias <> #{param2}
</if>
</select>
+ <select id="treeByParentId" resultMap="treeNodeResultMap">
+ select id, parent_id, role_name as title, id as "value", id as "key" from blade_role where is_deleted = 0
+ <if test="_parameter!=null and _parameter!=''">
+ and (
+ id = #{_parameter} or parent_id = #{_parameter} or parent_id in (
+ select b.id from blade_role b where b.is_deleted = 0 and b.PARENT_ID = #{_parameter}
+ ) or role_alias like '%zrr'
+ )
+ </if>
+ ORDER BY sort
+ </select>
+
<select id="getRoleNames" resultType="java.lang.String">
SELECT
role_name
--
Gitblit v1.9.3