From 8853292babb2ad94de4a3207966f1e83b767cd2d Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Sun, 17 Sep 2023 16:38:34 +0800
Subject: [PATCH] 新增流程节点进程查询接口

---
 src/main/java/org/springblade/modules/system/mapper/RoleMapper.xml |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 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 931d402..723bf61 100644
--- a/src/main/java/org/springblade/modules/system/mapper/RoleMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/RoleMapper.xml
@@ -97,12 +97,17 @@
             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 FROM blade_role t where is_deleted =0 ORDER BY parent_id, id ) t1,
+                ( 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
-            ischild != 0
-        ) on br.id = t3.id
+            WHERE id != 1123598816738675201 and id != #{roleParam.roleId}
+            <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
             (

--
Gitblit v1.9.3