From ba0a45ed8f6638a39032a8c1f0166236e2fd8fb6 Mon Sep 17 00:00:00 2001 From: gaowdong Date: Fri, 14 Mar 2025 10:35:49 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=BF=E6=8D=A2=20mgr=5Fuser=5Frole=20?= =?UTF-8?q?=E8=A1=A8=E4=B8=BA=20sys=5Fuser=5Frole?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../auth/role/mapper/MgrRoleWarehouseMapper.xml | 2 +- .../resources/mapper/alloc/AllocAreaMapper.xml | 2 +- .../mapper/auth/MgrRoleCanteenMapper.xml | 2 +- .../resources/mapper/order/OrdAppInfoMapper.xml | 4 ++-- .../mapper/order/ReportSumMachineMapper.xml | 16 ++++++++-------- .../report/ReportAnalysisDishesSaleMapper.xml | 6 +++--- .../resources/mapper/role/MgrRoleAreaMapper.xml | 2 +- .../main/resources/mapper/v3/AccInfoMapper.xml | 2 +- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/auth/role/mapper/MgrRoleWarehouseMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/auth/role/mapper/MgrRoleWarehouseMapper.xml index 8085c1d7..00447fc2 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/auth/role/mapper/MgrRoleWarehouseMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/auth/role/mapper/MgrRoleWarehouseMapper.xml @@ -18,7 +18,7 @@ (SELECT r.warehouse_id FROM mgr_role_warehouse r LEFT JOIN sys_role o ON o.role_id = r.role_id - LEFT JOIN mgr_user_role u ON r.role_id = u.role_id + LEFT JOIN sys_user_role u ON r.role_id = u.role_id WHERE u.user_id = #{authPO.userId} AND o.del_flag = 0 AND o.role_key = #{authPO.roleCode}) t diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/alloc/AllocAreaMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/alloc/AllocAreaMapper.xml index 539318d5..9836c03f 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/alloc/AllocAreaMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/alloc/AllocAreaMapper.xml @@ -66,7 +66,7 @@ SELECT null FROM mgr_role_area it1 LEFT JOIN sys_role it2 ON it2.role_id = it1.role_id - LEFT JOIN mgr_user_role it3 ON it1.role_id = it3.role_id + LEFT JOIN sys_user_role it3 ON it1.role_id = it3.role_id WHERE it2.del_flag = 0 AND it2.role_key = #{authPO.roleCode} AND it3.user_id = #{authPO.userId} diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/auth/MgrRoleCanteenMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/auth/MgrRoleCanteenMapper.xml index 5a2bd6aa..a81524ad 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/auth/MgrRoleCanteenMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/auth/MgrRoleCanteenMapper.xml @@ -18,7 +18,7 @@ from (SELECT r.data_id, r.half_select FROM mgr_role_canteen r LEFT JOIN sys_role o ON o.role_id = r.role_id - LEFT JOIN mgr_user_role u ON r.role_id = u.role_id + LEFT JOIN sys_user_role u ON r.role_id = u.role_id WHERE u.user_id = #{authPO.userId} AND o.role_key = #{authPO.roleCode} AND o.del_flag = 0) s diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/order/OrdAppInfoMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/order/OrdAppInfoMapper.xml index 7a23fc28..df511a64 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/order/OrdAppInfoMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/order/OrdAppInfoMapper.xml @@ -248,7 +248,7 @@ SELECT null FROM mgr_role_org it1 LEFT JOIN sys_role it2 ON it2.role_id = it1.role_id - LEFT JOIN mgr_user_role it3 ON it1.role_id = it3.role_id + LEFT JOIN sys_user_role it3 ON it1.role_id = it3.role_id WHERE it2.del_flag = 0 AND it2.role_key = #{authPO.roleCode} AND it1.half_select = 1 @@ -261,7 +261,7 @@ SELECT NULL FROM mgr_role_canteen it1 LEFT JOIN sys_role it2 ON it2.role_id = it1.role_id - LEFT JOIN mgr_user_role it3 ON it1.role_id = it3.role_id + LEFT JOIN sys_user_role it3 ON it1.role_id = it3.role_id WHERE it2.del_flag = 0 AND it2.role_key = #{authPO.roleCode} AND it1.half_select = 1 diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/order/ReportSumMachineMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/order/ReportSumMachineMapper.xml index 4e0aeb5f..7cfb7996 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/order/ReportSumMachineMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/order/ReportSumMachineMapper.xml @@ -8,7 +8,7 @@ SELECT null FROM mgr_role_org it1 LEFT JOIN sys_role it2 ON it2.role_id = it1.role_id - LEFT JOIN mgr_user_role it3 ON it1.role_id = it3.role_id + LEFT JOIN sys_user_role it3 ON it1.role_id = it3.role_id WHERE it2.del_flag = 0 AND it2.role_key = #{authPO.roleCode} AND it1.half_select = 1 @@ -22,7 +22,7 @@ SELECT NULL FROM mgr_role_canteen it1 LEFT JOIN sys_role it2 ON it2.role_id = it1.role_id - LEFT JOIN mgr_user_role it3 ON it1.role_id = it3.role_id + LEFT JOIN sys_user_role it3 ON it1.role_id = it3.role_id WHERE it2.del_flag = 0 AND it2.role_key = #{authPO.roleCode} AND it1.half_select = 1 @@ -33,7 +33,7 @@ SELECT NULL FROM mgr_role_canteen it1 LEFT JOIN sys_role it2 ON it2.role_id = it1.role_id - LEFT JOIN mgr_user_role it3 ON it1.role_id = it3.role_id + LEFT JOIN sys_user_role it3 ON it1.role_id = it3.role_id WHERE it2.del_flag = 0 AND it2.role_key = #{authPO.roleCode} AND it1.half_select = 1 @@ -47,7 +47,7 @@ SELECT null FROM mgr_role_area it1 LEFT JOIN sys_role it2 ON it2.role_id = it1.role_id - LEFT JOIN mgr_user_role it3 ON it1.role_id = it3.role_id + LEFT JOIN sys_user_role it3 ON it1.role_id = it3.role_id WHERE it2.del_flag = 0 AND it2.role_key = #{authPO.roleCode} AND it1.half_select = 1 @@ -116,7 +116,7 @@ SELECT null FROM mgr_role_org it1 LEFT JOIN sys_role it2 ON it2.role_id = it1.role_id - LEFT JOIN mgr_user_role it3 ON it1.role_id = it3.role_id + LEFT JOIN sys_user_role it3 ON it1.role_id = it3.role_id WHERE it2.del_flag = 0 AND it2.role_key = #{authPO.roleCode} AND it1.half_select = 1 @@ -130,7 +130,7 @@ SELECT NULL FROM mgr_role_canteen it1 LEFT JOIN sys_role it2 ON it2.role_id = it1.role_id - LEFT JOIN mgr_user_role it3 ON it1.role_id = it3.role_id + LEFT JOIN sys_user_role it3 ON it1.role_id = it3.role_id WHERE it2.del_flag = 0 AND it2.role_key = #{authPO.roleCode} AND it1.half_select = 1 @@ -141,7 +141,7 @@ SELECT NULL FROM mgr_role_canteen it1 LEFT JOIN sys_role it2 ON it2.role_id = it1.role_id - LEFT JOIN mgr_user_role it3 ON it1.role_id = it3.role_id + LEFT JOIN sys_user_role it3 ON it1.role_id = it3.role_id WHERE it2.del_flag = 0 AND it2.role_key = #{authPO.roleCode} AND it1.half_select = 1 @@ -161,7 +161,7 @@ SELECT null FROM mgr_role_area it1 LEFT JOIN sys_role it2 ON it2.role_id = it1.role_id - LEFT JOIN mgr_user_role it3 ON it1.role_id = it3.role_id + LEFT JOIN sys_user_role it3 ON it1.role_id = it3.role_id WHERE it2.del_flag = 0 AND it2.role_key = #{authPO.roleCode} AND it1.half_select = 1 diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/report/ReportAnalysisDishesSaleMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/report/ReportAnalysisDishesSaleMapper.xml index a7aefe7f..9284cfab 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/report/ReportAnalysisDishesSaleMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/report/ReportAnalysisDishesSaleMapper.xml @@ -9,7 +9,7 @@ SELECT NULL FROM mgr_role_canteen it1 LEFT JOIN sys_role it2 ON it2.role_id = it1.role_id - LEFT JOIN mgr_user_role it3 ON it1.role_id = it3.role_id + LEFT JOIN sys_user_role it3 ON it1.role_id = it3.role_id WHERE it2.del_flag = 0 AND it2.role_key = #{authPO.roleCode} AND it1.half_select = 1 @@ -20,7 +20,7 @@ SELECT NULL FROM mgr_role_canteen it1 LEFT JOIN sys_role it2 ON it2.role_id = it1.role_id - LEFT JOIN mgr_user_role it3 ON it1.role_id = it3.role_id + LEFT JOIN sys_user_role it3 ON it1.role_id = it3.role_id WHERE it2.del_flag = 0 AND it2.role_key = #{authPO.roleCode} AND it1.half_select = 1 @@ -40,7 +40,7 @@ SELECT null FROM mgr_role_area it1 LEFT JOIN sys_role it2 ON it2.role_id = it1.role_id - LEFT JOIN mgr_user_role it3 ON it1.role_id = it3.role_id + LEFT JOIN sys_user_role it3 ON it1.role_id = it3.role_id WHERE it2.del_flag = 0 AND it2.role_key = #{authPO.roleCode} AND it1.half_select = 1 diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/role/MgrRoleAreaMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/role/MgrRoleAreaMapper.xml index 2de80514..b54db6f5 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/role/MgrRoleAreaMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/role/MgrRoleAreaMapper.xml @@ -7,7 +7,7 @@ SELECT r.data_id FROM mgr_role_area r LEFT JOIN sys_role o ON o.role_id = r.role_id - LEFT JOIN mgr_user_role u ON r.role_id = u.role_id + LEFT JOIN sys_user_role u ON r.role_id = u.role_id WHERE u.user_id = #{authPO.userId} AND o.role_key = #{authPO.roleCode} AND o.del_flag = 0 diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/v3/AccInfoMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/v3/AccInfoMapper.xml index 8ce0ddf8..dab55daa 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/v3/AccInfoMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/v3/AccInfoMapper.xml @@ -602,7 +602,7 @@ SELECT null FROM mgr_role_org it1 LEFT JOIN sys_role it2 ON it2.role_id = it1.role_id - LEFT JOIN mgr_user_role it3 ON it1.role_id = it3.role_id + LEFT JOIN sys_user_role it3 ON it1.role_id = it3.role_id WHERE it2.del_flag = 0 AND it2.role_key = #{authPO.roleCode} AND it1.half_select = 1