From 84936608f7febdf4862bcc2c613da782bd0312ac Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Thu, 6 Mar 2025 18:00:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E4=B8=BAsys=5Frole=20and=20sys=5Fuser?=
=?UTF-8?q?=5Frole?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../mapper/menu/MenuDishesMapper.xml | 282 ++++++++++--------
1 file changed, 151 insertions(+), 131 deletions(-)
diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuDishesMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuDishesMapper.xml
index 89f62600..cff7a6e5 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuDishesMapper.xml
+++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuDishesMapper.xml
@@ -541,9 +541,14 @@
left join alloc_area aa on md.area_id = aa.area_id
left join alloc_canteen ac on md.canteen_id = ac.canteen_id
left join alloc_stall ast on md.shopstall_id = ast.stall_id
+ LEFT JOIN sys_role sr ON aa.area_id = sr.area_id
+ LEFT JOIN sys_user_role sur ON sr.role_id = sur.role_id
where
md.del_flag = 2
and hide_flag = 2
+ AND sr.del_flag = 0
+ AND sr.role_key = #{authPO.roleCode}
+ AND sur.user_id = #{authPO.userId}
and md.sales_mode = #{content.salesMode}
@@ -590,56 +595,56 @@
and mmd.material_id = #{content.materialId}
)
-
- and exists(
- select
- null
- from mgr_role_canteen it1
- left join mgr_role it2 on it2.role_id = it1.role_id
- left join mgr_user_role it3 on it1.role_id = it3.role_id
- where
- it2.del_flag = 2
- and it2.role_code = #{authPO.roleCode}
- and it3.user_id = #{authPO.userId}
- and (md.canteen_id = it1.data_id or md.canteen_id = -1)
- )
- AND EXISTS(
- select
- null
- from mgr_role_canteen it1
- left join mgr_role it2 on it2.role_id = it1.role_id
- left join mgr_user_role it3 on it1.role_id = it3.role_id
- where
- it2.del_flag = 2
- and it2.role_code = #{authPO.roleCode}
- and it3.user_id = #{authPO.userId}
- and (md.shopstall_id = it1.data_id or md.shopstall_id = -1)
- )
- and EXISTS (
- SELECT null
- FROM mgr_role_area it1
- LEFT JOIN mgr_role it2 ON it2.role_id = it1.role_id
- LEFT JOIN mgr_user_role it3 ON it1.role_id = it3.role_id
- WHERE it2.del_flag = 2
- AND it2.role_code = #{authPO.roleCode}
- AND it1.half_select = 1
- AND it3.user_id = #{authPO.userId}
- AND (md.area_id = it1.data_id or md.area_id = -1)
- )
-
-
- and EXISTS (
- SELECT null
- FROM mgr_role_area it1
- LEFT JOIN mgr_role it2 ON it2.role_id = it1.role_id
- LEFT JOIN mgr_user_role it3 ON it1.role_id = it3.role_id
- WHERE it2.del_flag = 2
- AND it2.role_code = #{authPO.roleCode}
- AND it1.half_select = 1
- AND it3.user_id = #{authPO.userId}
- AND (md.area_id = it1.data_id or md.area_id = -1)
- )
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
order by
md.id desc
@@ -723,8 +728,13 @@
left join alloc_canteen ac on md.canteen_id = ac.canteen_id
left join alloc_stall ass on ass.stall_id = md.shopstall_id
left join menu_dishes_type mdt on md.type_id = mdt.type_id
+ LEFT JOIN sys_role sr ON aa.area_id = sr.area_id
+ LEFT JOIN sys_user_role sur ON sr.role_id = sur.role_id
where
md.del_flag = 2
+ AND sr.del_flag = 0
+ AND sr.role_key = #{authPO.roleCode}
+ AND sur.user_id = #{authPO.userId}
and md.type_id = #{content.typeId}
@@ -762,33 +772,33 @@
and md.sales_mode = #{content.salesMode}
-
- and exists(
- select
- null
- from mgr_role_canteen it1
- left join mgr_role it2 on it2.role_id = it1.role_id
- left join mgr_user_role it3 on it1.role_id = it3.role_id
- where
- it2.del_flag = 2
- and it2.role_code = #{authPO.roleCode}
- and it3.user_id = #{authPO.userId}
- and (md.canteen_id = it1.data_id or md.canteen_id = -1)
- )
-
-
- and EXISTS (
- SELECT null
- FROM mgr_role_area it1
- LEFT JOIN mgr_role it2 ON it2.role_id = it1.role_id
- LEFT JOIN mgr_user_role it3 ON it1.role_id = it3.role_id
- WHERE it2.del_flag = 2
- AND it2.role_code = #{authPO.roleCode}
- AND it1.half_select = 1
- AND it3.user_id = #{authPO.userId}
- AND (md.area_id = it1.data_id or md.area_id = -1)
- )
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1255,9 +1265,14 @@
left join alloc_area aa on aa.area_id = md.area_id
left join alloc_canteen ac on md.canteen_id = ac.canteen_id
left join alloc_stall ass on ass.stall_id = md.shopstall_id
+ LEFT JOIN sys_role sr ON aa.area_id = sr.area_id
+ LEFT JOIN sys_user_role sur ON sr.role_id = sur.role_id
where
md.del_flag = 2
and hide_flag = 2
+ AND sr.del_flag = 0
+ AND sr.role_key = #{authPO.roleCode}
+ AND sur.user_id = #{authPO.userId}
and (
md.dishes_name like #{content.dishesName}
@@ -1289,33 +1304,33 @@
#{typeId}
-
- and exists(
- select
- null
- from mgr_role_canteen it1
- left join mgr_role it2 on it2.role_id = it1.role_id
- left join mgr_user_role it3 on it1.role_id = it3.role_id
- where
- it2.del_flag = 2
- and it2.role_code = #{authPO.roleCode}
- and it3.user_id = #{authPO.userId}
- and (md.canteen_id = it1.data_id or md.canteen_id = -1)
- )
-
-
- and EXISTS (
- SELECT null
- FROM mgr_role_area it1
- LEFT JOIN mgr_role it2 ON it2.role_id = it1.role_id
- LEFT JOIN mgr_user_role it3 ON it1.role_id = it3.role_id
- WHERE it2.del_flag = 2
- AND it2.role_code = #{authPO.roleCode}
- AND it1.half_select = 1
- AND it3.user_id = #{authPO.userId}
- AND (md.area_id = it1.data_id or md.area_id = -1)
- )
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
order by
md.id desc
@@ -1444,8 +1459,13 @@
from
menu_dishes_base mdb
left join menu_dishes md on mdb.base_dishes_id = md.base_dishes_id and md.size_json != '{"sizeType":"小份"}'
+ LEFT JOIN sys_role sr ON aa.area_id = sr.area_id
+ LEFT JOIN sys_user_role sur ON sr.role_id = sur.role_id
where
md.del_flag = 2
+ AND sr.del_flag = 0
+ AND sr.role_key = #{authPO.roleCode}
+ AND sur.user_id = #{authPO.userId}
and md.type_id = #{content.typeId}
@@ -1483,33 +1503,33 @@
and md.sales_mode = #{content.salesMode}
-
- and exists(
- select
- null
- from mgr_role_canteen it1
- left join mgr_role it2 on it2.role_id = it1.role_id
- left join mgr_user_role it3 on it1.role_id = it3.role_id
- where
- it2.del_flag = 2
- and it2.role_code = #{authPO.roleCode}
- and it3.user_id = #{authPO.userId}
- and (md.canteen_id = it1.data_id or md.canteen_id = -1)
- )
-
-
- and EXISTS (
- SELECT null
- FROM mgr_role_area it1
- LEFT JOIN mgr_role it2 ON it2.role_id = it1.role_id
- LEFT JOIN mgr_user_role it3 ON it1.role_id = it3.role_id
- WHERE it2.del_flag = 2
- AND it2.role_code = #{authPO.roleCode}
- AND it1.half_select = 1
- AND it3.user_id = #{authPO.userId}
- AND (md.area_id = it1.data_id or md.area_id = -1)
- )
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+