From e12e717a045c4b5d9893ddac9135c1721e7a0cc3 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 16 三月 2023 17:58:26 +0800
Subject: [PATCH] 上传更改过的源码jar包，上传租户管理相关功能
---
Source/BladeX/blade-service/blade-system/src/main/java/org/springblade/system/mapper/MenuMapper.xml | 102 +++++++++++++++++++++++++-------------------------
1 files changed, 51 insertions(+), 51 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 b0a9dbf..ccf0111 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
@@ -51,12 +51,12 @@
SELECT
CASE WHEN count( 1 ) > 0 THEN 1 ELSE 0 END
FROM
- blade_menu
+ pl_sys_menu
WHERE
parent_id = menu.id AND is_deleted = 0
) AS "has_children"
FROM
- blade_menu menu
+ pl_sys_menu menu
WHERE menu.is_deleted = 0
<if test="param1!=null">
and menu.parent_id = #{param1}
@@ -80,12 +80,12 @@
SELECT
CASE WHEN count( 1 ) > 0 THEN 1 ELSE 0 END
FROM
- blade_menu
+ pl_sys_menu
WHERE
parent_id = menu.id AND is_deleted = 0 AND category = 1
) AS "has_children"
FROM
- blade_menu menu
+ pl_sys_menu menu
WHERE menu.is_deleted = 0 AND menu.category = 1
<if test="param1!=null">
and menu.parent_id = #{param1}
@@ -103,16 +103,16 @@
</select>
<select id="tree" resultMap="treeNodeResultMap">
- select id, parent_id, name as title, id as "value", id as "key" from blade_menu where is_deleted = 0 and category = 1
+ select id, parent_id, name as title, id as "value", id as "key" from pl_sys_menu where is_deleted = 0 and category = 1
</select>
<select id="allMenu" resultMap="menuResultMap">
- select * from blade_menu where is_deleted = 0 and category = 1
+ select * from pl_sys_menu where is_deleted = 0 and category = 1
</select>
<select id="roleMenu" resultMap="menuResultMap">
- select * from blade_menu where is_deleted = 0 and id IN
- ( SELECT menu_id FROM blade_role_menu WHERE role_id IN
+ select * from pl_sys_menu where is_deleted = 0 and id IN
+ ( SELECT menu_id FROM pl_org_role_menu WHERE role_id IN
<foreach collection="param1" index="index" item="item" open="(" separator="," close=")">
#{item}
</foreach>
@@ -120,14 +120,14 @@
<if test="param2!=null and param2>0">
AND id IN
(
- SELECT menu_id FROM blade_top_menu_setting WHERE top_menu_id = #{param2}
+ SELECT menu_id FROM pl_sys_top_menu_setting WHERE top_menu_id = #{param2}
)
</if>
</select>
<select id="roleMenuByRoleId" resultMap="menuResultMap">
- select * from blade_menu where is_deleted = 0 and id IN
- ( SELECT menu_id FROM blade_role_menu WHERE role_id IN
+ select * from pl_sys_menu where is_deleted = 0 and id IN
+ ( SELECT menu_id FROM pl_org_role_menu WHERE role_id IN
<foreach collection="list" index="index" item="item" open="(" separator="," close=")">
#{item}
</foreach>
@@ -135,9 +135,9 @@
</select>
<select id="roleMenuByTopMenuId" resultMap="menuResultMap">
- select * from blade_menu where is_deleted = 0 and id IN
+ select * from pl_sys_menu where is_deleted = 0 and id IN
(
- SELECT menu_id FROM blade_top_menu_setting WHERE top_menu_id = #{param1}
+ SELECT menu_id FROM pl_sys_top_menu_setting WHERE top_menu_id = #{param1}
)
</select>
@@ -145,10 +145,10 @@
SELECT
*
FROM
- blade_menu
+ pl_sys_menu
WHERE
is_deleted = 0 and category = 1
- and id IN ( SELECT menu_id FROM blade_role_menu WHERE role_id IN
+ and id IN ( SELECT menu_id FROM pl_org_role_menu WHERE role_id IN
<foreach collection="list" index="index" item="item" open="(" separator="," close=")">
#{item}
</foreach> )
@@ -166,10 +166,10 @@
action,
sort
FROM
- blade_menu
+ pl_sys_menu
WHERE
(
- category = 2 OR id IN ( SELECT parent_id FROM blade_menu WHERE is_deleted = 0 AND category = 2 )
+ category = 2 OR id IN ( SELECT parent_id FROM pl_sys_menu WHERE is_deleted = 0 AND category = 2 )
)
AND is_deleted = 0
ORDER BY sort
@@ -188,11 +188,11 @@
action,
sort
FROM
- blade_menu
+ pl_sys_menu
WHERE
is_deleted = 0 and id IN (
- SELECT parent_id FROM blade_menu
- WHERE ( category = 2 AND id IN ( SELECT menu_id FROM blade_role_menu WHERE role_id IN
+ SELECT parent_id FROM pl_sys_menu
+ WHERE ( category = 2 AND id IN ( SELECT menu_id FROM pl_org_role_menu WHERE role_id IN
<foreach collection="list" index="index" item="item" open="(" separator="," close=")">
#{item}
</foreach>
@@ -211,9 +211,9 @@
action,
sort
FROM
- blade_menu
+ pl_sys_menu
WHERE
- is_deleted = 0 and category = 2 AND id IN ( SELECT menu_id FROM blade_role_menu WHERE role_id IN
+ is_deleted = 0 and category = 2 AND id IN ( SELECT menu_id FROM pl_org_role_menu WHERE role_id IN
<foreach collection="list" index="index" item="item" open="(" separator="," close=")">
#{item}
</foreach>)
@@ -221,18 +221,18 @@
</select>
<select id="grantTree" resultMap="treeNodeResultMap">
- select id, parent_id, name as title, id as "value", id as "key" from blade_menu where is_deleted = 0 order by sort
+ select id, parent_id, name as title, id as "value", id as "key" from pl_sys_menu where is_deleted = 0 order by sort
</select>
<select id="grantTreeByRole" resultMap="treeNodeResultMap">
- select id, parent_id, name as title, id as "value", id as "key" from blade_menu where is_deleted = 0
- and id in ( select menu_id from blade_role_menu where role_id in
+ select id, parent_id, name as title, id as "value", id as "key" from pl_sys_menu where is_deleted = 0
+ and id in ( select menu_id from pl_org_role_menu where role_id in
<foreach collection="list" index="index" item="item" open="(" separator="," close=")">
#{item}
</foreach> )
or id in (
- select parent_id from blade_menu where is_deleted = 0
- and id in ( select menu_id from blade_role_menu where role_id in
+ select parent_id from pl_sys_menu where is_deleted = 0
+ and id in ( select menu_id from pl_org_role_menu where role_id in
<foreach collection="list" index="index" item="item" open="(" separator="," close=")">
#{item}
</foreach> )
@@ -241,18 +241,18 @@
</select>
<select id="grantTopTree" resultMap="treeNodeResultMap">
- select id, parent_id, name as title, id as "value", id as "key" from blade_menu where category = 1 and is_deleted = 0 order by sort
+ select id, parent_id, name as title, id as "value", id as "key" from pl_sys_menu where category = 1 and is_deleted = 0 order by sort
</select>
<select id="grantTopTreeByRole" resultMap="treeNodeResultMap">
- select id, parent_id, name as title, id as "value", id as "key" from blade_menu where category = 1 and is_deleted = 0
- and id in ( select menu_id from blade_role_menu where role_id in
+ select id, parent_id, name as title, id as "value", id as "key" from pl_sys_menu where category = 1 and is_deleted = 0
+ and id in ( select menu_id from pl_org_role_menu where role_id in
<foreach collection="list" index="index" item="item" open="(" separator="," close=")">
#{item}
</foreach> )
or id in (
- select parent_id from blade_menu where is_deleted = 0
- and id in ( select menu_id from blade_role_menu where role_id in
+ select parent_id from pl_sys_menu where is_deleted = 0
+ and id in ( select menu_id from pl_org_role_menu where role_id in
<foreach collection="list" index="index" item="item" open="(" separator="," close=")">
#{item}
</foreach> )
@@ -272,7 +272,7 @@
id AS "value",
id AS "key"
FROM
- blade_menu
+ pl_sys_menu
WHERE
category = 1
AND is_deleted = 0
@@ -306,7 +306,7 @@
id AS "value",
id AS "key"
FROM
- blade_menu
+ pl_sys_menu
WHERE
category = 1
AND is_deleted = 0
@@ -340,21 +340,21 @@
id AS "value",
id AS "key"
FROM
- blade_menu
+ pl_sys_menu
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 blade_role_menu where role_id in
+ select menu_id from pl_org_role_menu where role_id in
<foreach collection="list" index="index" item="item" open="(" separator="," close=")">
#{item}
</foreach>
)
OR id IN (
- select parent_id from blade_menu where is_deleted = 0
- and id in ( select menu_id from blade_role_menu where role_id in
+ select parent_id from pl_sys_menu where is_deleted = 0
+ and id in ( select menu_id from pl_org_role_menu where role_id in
<foreach collection="list" index="index" item="item" open="(" separator="," close=")">
#{item}
</foreach> )
@@ -376,14 +376,14 @@
is_deleted = 0
AND (
menu_id IN (
- select menu_id from blade_role_menu where role_id in
+ select menu_id from pl_org_role_menu where role_id in
<foreach collection="list" index="index" item="item" open="(" separator="," close=")">
#{item}
</foreach>
)
OR menu_id IN (
- select parent_id from blade_menu where is_deleted = 0
- and id in ( select menu_id from blade_role_menu where role_id in
+ select parent_id from pl_sys_menu where is_deleted = 0
+ and id in ( select menu_id from pl_org_role_menu where role_id in
<foreach collection="list" index="index" item="item" open="(" separator="," close=")">
#{item}
</foreach> )
@@ -404,22 +404,22 @@
id AS "value",
id AS "key"
FROM
- blade_menu
+ pl_sys_menu
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 blade_role_menu where role_id in
+ select menu_id from pl_org_role_menu where role_id in
<foreach collection="list" index="index" item="item" open="(" separator="," close=")">
#{item}
</foreach>
)
OR id IN (
- select parent_id from blade_menu where is_deleted = 0
+ select parent_id from pl_sys_menu where is_deleted = 0
and id in (
- select menu_id from blade_role_menu where role_id in
+ select menu_id from pl_org_role_menu where role_id in
<foreach collection="list" index="index" item="item" open="(" separator="," close=")">
#{item}
</foreach> )
@@ -442,14 +442,14 @@
AND
(
menu_id IN (
- select menu_id from blade_role_menu where role_id in
+ select menu_id from pl_org_role_menu where role_id in
<foreach collection="list" index="index" item="item" open="(" separator="," close=")">
#{item}
</foreach>
)
OR menu_id IN (
- select parent_id from blade_menu where is_deleted = 0
- and id in ( select menu_id from blade_role_menu where role_id in
+ select parent_id from pl_sys_menu where is_deleted = 0
+ and id in ( select menu_id from pl_org_role_menu where role_id in
<foreach collection="list" index="index" item="item" open="(" separator="," close=")">
#{item}
</foreach> )
@@ -463,9 +463,9 @@
GROUP_CONCAT(r.role_alias) as alias,
m.path
FROM
- blade_role_menu rm
- LEFT JOIN blade_menu m ON rm.menu_id = m.id
- LEFT JOIN blade_role r ON rm.role_id = r.id
+ pl_org_role_menu rm
+ LEFT JOIN pl_sys_menu m ON rm.menu_id = m.id
+ LEFT JOIN pl_org_role r ON rm.role_id = r.id
WHERE
rm.role_id IN
<foreach collection="list" index="index" item="item" open="(" separator="," close=")">
--
Gitblit v1.9.3