From b8838cbae89b10f4a862147718178f5d0430246c Mon Sep 17 00:00:00 2001
From: MaxKey <shimingxy@qq.com>
Date: Sun, 8 Oct 2023 22:46:34 +0800
Subject: [PATCH] =?UTF-8?q?#I8651R=20=E6=96=B0=E5=BB=BA=E4=BA=86=E5=BA=94?=
 =?UTF-8?q?=E7=94=A8=EF=BC=8C=E4=BD=86=E5=9C=A8=E8=AE=A4=E8=AF=81=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E9=87=8C=E9=9D=A2=E7=9C=8B=E4=B8=8D=E5=88=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/xml/mysql/AppsMapper.xml           | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/maxkey-persistence/src/main/resources/org/dromara/maxkey/persistence/mapper/xml/mysql/AppsMapper.xml b/maxkey-persistence/src/main/resources/org/dromara/maxkey/persistence/mapper/xml/mysql/AppsMapper.xml
index f3e147747..9e1673c9d 100644
--- a/maxkey-persistence/src/main/resources/org/dromara/maxkey/persistence/mapper/xml/mysql/AppsMapper.xml
+++ b/maxkey-persistence/src/main/resources/org/dromara/maxkey/persistence/mapper/xml/mysql/AppsMapper.xml
@@ -180,28 +180,28 @@
         select distinct
             app.*
         from
-            mxk_apps app,mxk_role_permissions p,mxk_roles r
+            mxk_apps app,mxk_group_permissions p,mxk_groups g
         where
             app.id  =   p.appid
-            and p.roleid = r.id
+            and p.groupid = g.id
             and app.instid = #{instId}
             and p.instid = #{instId}
-            and r.instid = #{instId}
+            and g.instid = #{instId}
             and app.visible != 0
-            and r.id in(
+            and g.id in(
                     <!-- ROLE_ALL_USER -->
-                    select id as roleid 
-                    from mxk_roles 
-                    where rolecode = 'ROLE_ALL_USER'
+                    select id as groupid 
+                    from mxk_groups 
+                    where groupcode = 'ROLE_ALL_USER'
                     
                     union 
                     
-                    <!-- role member -->
+                    <!-- groups member -->
                     select 
-                      rm.roleid 
+                      gm.groupid 
                     from 
-                      mxk_role_member rm,mxk_userinfo u 
-                    where rm.memberid    =   u.id 
+                      mxk_group_member gm,mxk_userinfo u 
+                    where gm.memberid    =   u.id 
                       <if test="userId != null and userId != ''">
                           and u.id        =   #{userId}
                       </if>