Explorar el Código

Merge branch 'han' of uskycloud/usky-cloud into system-165

hanzhengyi hace 8 meses
padre
commit
53a422e8c3

+ 3 - 3
base-modules/service-system/service-system-biz/src/main/resources/mapper/system/SysMenuMapper.xml

@@ -223,12 +223,12 @@
                         m.remark,
                         m.isNew
         from sys_menu m
-                 left join sys_role_menu rm on m.menu_id = rm.menu_id
+                 left join sys_platform_menu pm ON m.menu_id = pm.menu_id
+                 left join sys_role_menu rm on pm.menu_id = rm.menu_id
                  left join sys_user_role ur on rm.role_id = ur.role_id
                  left join sys_role ro on ur.role_id = ro.role_id
-                 left join sys_user u on ur.user_id = u.user_id
+                 left join sys_user u on u.user_id = ur.user_id
                  left join sys_tenant_menu t on u.tenant_id = t.tenant_id
-                 left join sys_platform_menu pm ON t.menu_id = pm.menu_id
         where u.user_id = #{userId}
           and m.menu_type in ('M', 'C')
           and m.status = 0