From fbe37e2e00bddec409b595a4a6e50c4bb32a008a Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 21 三月 2023 18:29:55 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs
---
Source/BladeX/blade-service/blade-system/src/main/java/org/springblade/system/mapper/MenuMapper.xml | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/Source/BladeX/blade-service/blade-system/src/main/java/org/springblade/system/mapper/MenuMapper.xml b/Source/BladeX/blade-service/blade-system/src/main/java/org/springblade/system/mapper/MenuMapper.xml
index ccf0111..a9cc4d7 100644
--- a/Source/BladeX/blade-service/blade-system/src/main/java/org/springblade/system/mapper/MenuMapper.xml
+++ b/Source/BladeX/blade-service/blade-system/src/main/java/org/springblade/system/mapper/MenuMapper.xml
@@ -276,7 +276,7 @@
WHERE
category = 1
AND is_deleted = 0
- AND id IN ( SELECT menu_id FROM blade_scope_data WHERE is_deleted = 0 AND menu_id IS NOT NULL )
+ AND id IN ( SELECT menu_id FROM pl_auth_scope_data WHERE is_deleted = 0 AND menu_id IS NOT NULL )
) menu
UNION ALL
@@ -288,7 +288,7 @@
id AS "value",
id AS "key"
FROM
- blade_scope_data
+ pl_auth_scope_data
WHERE
is_deleted = 0
AND menu_id IS NOT NULL
@@ -310,7 +310,7 @@
WHERE
category = 1
AND is_deleted = 0
- AND id IN ( SELECT menu_id FROM blade_scope_api WHERE is_deleted = 0 AND menu_id IS NOT NULL )
+ AND id IN ( SELECT menu_id FROM pl_auth_scope_api WHERE is_deleted = 0 AND menu_id IS NOT NULL )
) menu
UNION ALL
@@ -322,7 +322,7 @@
id AS "value",
id AS "key"
FROM
- blade_scope_api
+ pl_auth_scope_api
WHERE
is_deleted = 0
AND menu_id IS NOT NULL
@@ -344,7 +344,7 @@
WHERE
category = 1
AND is_deleted = 0
- AND id IN ( SELECT menu_id FROM blade_scope_data WHERE is_deleted = 0 AND menu_id IS NOT NULL )
+ AND id IN ( SELECT menu_id FROM pl_auth_scope_data WHERE is_deleted = 0 AND menu_id IS NOT NULL )
AND (
id IN (
select menu_id from pl_org_role_menu where role_id in
@@ -371,7 +371,7 @@
id AS "value",
id AS "key"
FROM
- blade_scope_data
+ pl_auth_scope_data
WHERE
is_deleted = 0
AND (
@@ -408,7 +408,7 @@
WHERE
category = 1
AND is_deleted = 0
- AND id IN ( SELECT menu_id FROM blade_scope_api WHERE is_deleted = 0 AND menu_id IS NOT NULL )
+ AND id IN ( SELECT menu_id FROM pl_auth_scope_api WHERE is_deleted = 0 AND menu_id IS NOT NULL )
AND (
id IN (
select menu_id from pl_org_role_menu where role_id in
@@ -436,7 +436,7 @@
id AS "value",
id AS "key"
FROM
- blade_scope_api
+ pl_auth_scope_api
WHERE
is_deleted = 0
AND
--
Gitblit v1.9.3