From ff74b385ca269cfcf6de32466489b767034c41b8 Mon Sep 17 00:00:00 2001
From: hiparker <meet.parker@foxmail.com>
Date: Wed, 12 May 2021 10:41:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=94=A8=E6=88=B7=E8=A7=92?=
 =?UTF-8?q?=E8=89=B2=E5=85=B3=E8=81=94xml?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../user/mapper/xml/UserRoleRefMapper.xml     | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/user/mapper/xml/UserRoleRefMapper.xml b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/user/mapper/xml/UserRoleRefMapper.xml
index 9b98b0e..96f2163 100644
--- a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/user/mapper/xml/UserRoleRefMapper.xml
+++ b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/user/mapper/xml/UserRoleRefMapper.xml
@@ -7,18 +7,25 @@
             a.user_id
         from
         sys_user_role_ref a
-        where
-            a.role_id = #{roleId}
+        join sys_user b on a.user_id = b.id
+        <where>
+            b.deleted = 0
+            and a.role_id = #{roleId}
+        </where>
     </select>
 
     <select id="getUserIdListByMenuId"  resultType="String">
         select
-            a.user_id
+            b.user_id
         from
-        sys_user_role_ref a
-        left join sys_role_menu_ref b on b.role_id = a.role_id
-        where
-            b.menu_id = #{menuId}
+        sys_role_menu_ref a
+        join sys_user_role_ref b on b.role_id = a.role_id
+        join sys_menu menu on menu.id = b.menu_id
+        <where>
+            menu.deleted = 0
+            and menu.parent_id != -1
+            and a.menu_id = #{menuId}
+        </where>
     </select>