diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/auth/role/entity/MgrRole.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/auth/role/entity/MgrRole.java
index e4fa383d..882e8620 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/auth/role/entity/MgrRole.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/auth/role/entity/MgrRole.java
@@ -11,7 +11,7 @@ import lombok.Data;
 
 import java.time.LocalDateTime;
 
-@TableName("mgr_role")
+@TableName("sys_role")
 @ApiModel("系统角色表")
 @Data
 public class MgrRole extends Model<MgrRole> {
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 ac23d733..8085c1d7 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
@@ -17,11 +17,11 @@
             <when test="'3'.toString() == authPO.roleType.toString()">
                 (SELECT r.warehouse_id
                  FROM mgr_role_warehouse r
-                          LEFT JOIN mgr_role o ON o.role_id = r.role_id
+                          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
                  WHERE u.user_id = #{authPO.userId}
-                   AND o.del_flag = 2
-                   AND o.role_code = #{authPO.roleCode}) t
+                   AND o.del_flag = 0
+                   AND o.role_key = #{authPO.roleCode}) t
                     LEFT JOIN drp_warehouse d ON d.warehouse_id = t.warehouse_id
                 <where>
                     <if test="delFlag != null">
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 2bd35348..539318d5 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
@@ -65,10 +65,10 @@
             and EXISTS (
             SELECT null
             FROM mgr_role_area it1
-            LEFT JOIN mgr_role it2 ON it2.role_id = it1.role_id
+            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
-            WHERE it2.del_flag = 2
-            AND it2.role_code = #{authPO.roleCode}
+            WHERE it2.del_flag = 0
+            AND it2.role_key = #{authPO.roleCode}
             AND it3.user_id = #{authPO.userId}
             AND t1.area_id = it1.data_id
             )
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 3d7285f1..5a2bd6aa 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
@@ -17,11 +17,11 @@
                              half_select
                       from (SELECT r.data_id, r.half_select
                             FROM mgr_role_canteen r
-                                     LEFT JOIN mgr_role o ON o.role_id = r.role_id
+                                     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
                             WHERE u.user_id = #{authPO.userId}
-                              AND o.role_code = #{authPO.roleCode}
-                              AND o.del_flag = 2) s
+                              AND o.role_key = #{authPO.roleCode}
+                              AND o.del_flag = 0) s
                       ORDER BY data_id, half_select) t
                          LEFT JOIN (SELECT #{merchantId} AS id,
                                            -1            AS parent_id,
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 386520e5..7a23fc28 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
@@ -247,10 +247,10 @@
                 and EXISTS (
                 SELECT null
                 FROM mgr_role_org it1
-                LEFT JOIN mgr_role it2 ON it2.role_id = it1.role_id
+                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
-                WHERE it2.del_flag = 2
-                AND it2.role_code = #{authPO.roleCode}
+                WHERE it2.del_flag = 0
+                AND it2.role_key = #{authPO.roleCode}
                 AND it1.half_select = 1
                 AND it3.user_id = #{authPO.userId}
                 AND ci.dept_id = it1.org_id
@@ -260,10 +260,10 @@
                 AND EXISTS(
                 SELECT NULL
                 FROM mgr_role_canteen it1
-                LEFT JOIN mgr_role it2 ON it2.role_id = it1.role_id
+                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
-                WHERE it2.del_flag = 2
-                AND it2.role_code = #{authPO.roleCode}
+                WHERE it2.del_flag = 0
+                AND it2.role_key = #{authPO.roleCode}
                 AND it1.half_select = 1
                 AND it3.user_id = #{authPO.userId}
                 AND (oai.stall_id = it1.data_id or oai.canteen_id = it1.data_id)
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 16127879..4e0aeb5f 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
@@ -7,10 +7,10 @@
             and EXISTS (
             SELECT null
             FROM mgr_role_org it1
-            LEFT JOIN mgr_role it2 ON it2.role_id = it1.role_id
+            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
-            WHERE it2.del_flag = 2
-            AND it2.role_code = #{authPO.roleCode}
+            WHERE it2.del_flag = 0
+            AND it2.role_key = #{authPO.roleCode}
             AND it1.half_select = 1
             AND it3.user_id = #{authPO.userId}
             AND a.org_id = it1.org_id
@@ -21,10 +21,10 @@
             EXISTS(
             SELECT NULL
             FROM mgr_role_canteen it1
-            LEFT JOIN mgr_role it2 ON it2.role_id = it1.role_id
+            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
-            WHERE it2.del_flag = 2
-            AND it2.role_code = #{authPO.roleCode}
+            WHERE it2.del_flag = 0
+            AND it2.role_key = #{authPO.roleCode}
             AND it1.half_select = 1
             AND it3.user_id = #{authPO.userId}
             AND (a.canteen_id = it1.data_id)
@@ -32,10 +32,10 @@
             OR EXISTS (
             SELECT NULL
             FROM mgr_role_canteen it1
-            LEFT JOIN mgr_role it2 ON it2.role_id = it1.role_id
+            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
-            WHERE it2.del_flag = 2
-            AND it2.role_code = #{authPO.roleCode}
+            WHERE it2.del_flag = 0
+            AND it2.role_key = #{authPO.roleCode}
             AND it1.half_select = 1
             AND it3.user_id = #{authPO.userId}
             AND (a.stall_id = it1.data_id)
@@ -46,10 +46,10 @@
             and EXISTS (
             SELECT null
             FROM mgr_role_area it1
-            LEFT JOIN mgr_role it2 ON it2.role_id = it1.role_id
+            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
-            WHERE it2.del_flag = 2
-            AND it2.role_code = #{authPO.roleCode}
+            WHERE it2.del_flag = 0
+            AND it2.role_key = #{authPO.roleCode}
             AND it1.half_select = 1
             AND it3.user_id = #{authPO.userId}
             AND c.area_id = it1.data_id
@@ -115,10 +115,10 @@
                 and EXISTS (
                 SELECT null
                 FROM mgr_role_org it1
-                LEFT JOIN mgr_role it2 ON it2.role_id = it1.role_id
+                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
-                WHERE it2.del_flag = 2
-                AND it2.role_code = #{authPO.roleCode}
+                WHERE it2.del_flag = 0
+                AND it2.role_key = #{authPO.roleCode}
                 AND it1.half_select = 1
                 AND it3.user_id = #{authPO.userId}
                 AND o.org_id = it1.org_id
@@ -129,10 +129,10 @@
                 EXISTS(
                 SELECT NULL
                 FROM mgr_role_canteen it1
-                LEFT JOIN mgr_role it2 ON it2.role_id = it1.role_id
+                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
-                WHERE it2.del_flag = 2
-                AND it2.role_code = #{authPO.roleCode}
+                WHERE it2.del_flag = 0
+                AND it2.role_key = #{authPO.roleCode}
                 AND it1.half_select = 1
                 AND it3.user_id = #{authPO.userId}
                 AND (o.canteen_id = it1.data_id)
@@ -140,10 +140,10 @@
                 OR EXISTS (
                 SELECT NULL
                 FROM mgr_role_canteen it1
-                LEFT JOIN mgr_role it2 ON it2.role_id = it1.role_id
+                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
-                WHERE it2.del_flag = 2
-                AND it2.role_code = #{authPO.roleCode}
+                WHERE it2.del_flag = 0
+                AND it2.role_key = #{authPO.roleCode}
                 AND it1.half_select = 1
                 AND it3.user_id = #{authPO.userId}
                 AND (o.stall_id = it1.data_id)
@@ -160,10 +160,10 @@
                 and EXISTS (
                 SELECT null
                 FROM mgr_role_area it1
-                LEFT JOIN mgr_role it2 ON it2.role_id = it1.role_id
+                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
-                WHERE it2.del_flag = 2
-                AND it2.role_code = #{authPO.roleCode}
+                WHERE it2.del_flag = 0
+                AND it2.role_key = #{authPO.roleCode}
                 AND it1.half_select = 1
                 AND it3.user_id = #{authPO.userId}
                 AND c.area_id = it1.data_id
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 d62b7a01..a7aefe7f 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
@@ -8,10 +8,10 @@
             EXISTS(
             SELECT NULL
             FROM mgr_role_canteen it1
-            LEFT JOIN mgr_role it2 ON it2.role_id = it1.role_id
+            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
-            WHERE it2.del_flag = 2
-            AND it2.role_code = #{authPO.roleCode}
+            WHERE it2.del_flag = 0
+            AND it2.role_key = #{authPO.roleCode}
             AND it1.half_select = 1
             AND it3.user_id = #{authPO.userId}
             AND (a.stall_id = it1.data_id)
@@ -19,10 +19,10 @@
             OR EXISTS (
             SELECT NULL
             FROM mgr_role_canteen it1
-            LEFT JOIN mgr_role it2 ON it2.role_id = it1.role_id
+            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
-            WHERE it2.del_flag = 2
-            AND it2.role_code = #{authPO.roleCode}
+            WHERE it2.del_flag = 0
+            AND it2.role_key = #{authPO.roleCode}
             AND it1.half_select = 1
             AND it3.user_id = #{authPO.userId}
             AND (a.canteen_id = it1.data_id)
@@ -39,10 +39,10 @@
             and EXISTS (
             SELECT null
             FROM mgr_role_area it1
-            LEFT JOIN mgr_role it2 ON it2.role_id = it1.role_id
+            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
-            WHERE it2.del_flag = 2
-            AND it2.role_code = #{authPO.roleCode}
+            WHERE it2.del_flag = 0
+            AND it2.role_key = #{authPO.roleCode}
             AND it1.half_select = 1
             AND it3.user_id = #{authPO.userId}
             AND ac.area_id = it1.data_id
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 c1aaad59..2de80514 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
@@ -6,11 +6,11 @@
     <select id="getTenantAreaIdList" resultType="java.lang.Long">
         SELECT r.data_id
         FROM mgr_role_area r
-                 LEFT JOIN mgr_role o ON o.role_id = r.role_id
+                 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
         WHERE u.user_id = #{authPO.userId}
-          AND o.role_code = #{authPO.roleCode}
-          AND o.del_flag = 2
+          AND o.role_key = #{authPO.roleCode}
+          AND o.del_flag = 0
         <if test="excludeMiddle == 1">
             AND r.half_select = 1
         </if>
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 085f8cb5..8ce0ddf8 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
@@ -601,10 +601,10 @@
             and EXISTS (
             SELECT null
             FROM mgr_role_org it1
-            LEFT JOIN mgr_role it2 ON it2.role_id = it1.role_id
+            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
-            WHERE it2.del_flag = 2
-            AND it2.role_code = #{authPO.roleCode}
+            WHERE it2.del_flag = 0
+            AND it2.role_key = #{authPO.roleCode}
             AND it1.half_select = 1
             AND it3.user_id = #{authPO.userId}
             AND it1.org_id = ci.dept_id