From 1dd5d8f8a616f5cf3caa7828d46989c7d3dcafc4 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Thu, 19 Oct 2023 15:01:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/mapper/RoleMapper.xml | 35 +++++++++++++++++++++++++++++++++--
1 files changed, 33 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..f81f86a 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,12 +26,43 @@
<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>
+ ORDER BY sort
+ </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 (
+ (
+ <foreach collection="array" item="parentId" index="index" open="(" close=")" separator="or">
+ id = #{parentId}
+ </foreach>
+ )
+ or
+ (
+ <foreach collection="array" item="parentId" index="index" open="(" close=")" separator="or">
+ parent_id = #{parentId}
+ </foreach>
+ )
+
+ or parent_id in (
+ select b.id from blade_role b where b.is_deleted = 0 and
+ (
+ <foreach collection="array" item="parentId" index="index" open="(" close=")" separator="or">
+ b.PARENT_ID = #{parentId}
+ </foreach>
+ )
+
+ ) or role_alias like '%zrr'
+ )
+ </if>
+ ORDER BY sort
</select>
<select id="getRoleNames" resultType="java.lang.String">
--
Gitblit v1.9.3