From 76d9d4af124631ffe68c5f8dfd2c6d54c61fcefa Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 23 May 2023 19:45:01 +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 | 23 +++++++++++++++++++++--
1 files changed, 21 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 885a839..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
@@ -32,14 +32,33 @@
<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 (
- 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}
+ (
+ <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>
--
Gitblit v1.9.3