1.0.3,bug修改

paper-library-business/src/main/java/com/qmth/paper/library/business/service/impl/ClientServiceImpl.java

@@ -194,8 +194,8 @@ public class ClientServiceImpl implements ClientService {
 
             //开启条码识别，需要自动做一次绑定
             Map<String, SimpleObject> sysSetting = commonCacheService.getSysSetting(schoolId);
-            String value = sysSetting.get(SysSettingConstant.BAR_CODE_OPEN).getValue();
-            if (sysSetting != null && Boolean.parseBoolean(value)) {
+            String value = !sysSetting.containsKey(SysSettingConstant.BAR_CODE_OPEN) ? "false" : sysSetting.get(SysSettingConstant.BAR_CODE_OPEN).getValue();
+            if (Boolean.parseBoolean(value)) {
                 // 根据准考证号查询学生student_id
                 BasicStudent basicStudent = basicStudentService.getBySchoolIdAndStudentCode(studentCode);
                 if (basicStudent != null) {

paper-library-business/src/main/resources/mapper/PaperLibraryMapper.xml

@@ -39,7 +39,7 @@
             paper_scan_task_detail pstd
                 LEFT JOIN
             paper_scan_task pst
-                AND pstd.paper_scan_task_id = pst.id
+                ON pstd.paper_scan_task_id = pst.id
                 LEFT JOIN
             paper_archives pa ON pst.paper_archives_id = pa.id
                 LEFT JOIN

paper-library-common/src/main/java/com/qmth/paper/library/common/service/impl/CommonCacheServiceImpl.java

@@ -55,13 +55,15 @@ public class CommonCacheServiceImpl implements CommonCacheService {
     @Override
     @Cacheable(value = SystemConstant.CACHE_NAME, key = "'sysSetting' + #schoolId")
     public Map<String, SimpleObject> getSysSetting(Long schoolId) {
-        SysSetting sysSetting = sysSettingService.getBySchoolId(schoolId);
-        String parameterObject = sysSetting.getParameterObject();
-        List<SettingObject> settingObjects = JSON.parseArray(parameterObject, SettingObject.class);
         Map<String, SimpleObject> map = new HashMap<>();
-        for (SettingObject settingObject : settingObjects) {
-            for (SimpleObject simpleObject : settingObject.getData()) {
-                map.put(simpleObject.getCode(), simpleObject);
+        SysSetting sysSetting = sysSettingService.getBySchoolId(schoolId);
+        if (sysSetting != null) {
+            String parameterObject = sysSetting.getParameterObject();
+            List<SettingObject> settingObjects = JSON.parseArray(parameterObject, SettingObject.class);
+            for (SettingObject settingObject : settingObjects) {
+                for (SimpleObject simpleObject : settingObject.getData()) {
+                    map.put(simpleObject.getCode(), simpleObject);
+                }
             }
         }
         return map;

paper-library-common/src/main/resources/mapper/SysRoleMapper.xml

@@ -51,7 +51,7 @@
         select * from(
         <include refid="Base_Column_List"></include>
         <where>
-            <if test="schoolId != null and schoolId != ''">
+            <if test="schoolId != null">
                 and school_id = #{schoolId}
             </if>
             <if test="name != null and name != ''">
@@ -63,7 +63,7 @@
         </where>
         union
         <include refid="Base_Column_List"></include>
-        where school_id is null and default_role = 1 and type <![CDATA[ <> ]]> 'ADMIN'
+        where school_id is null and default_role = 1 and (type <![CDATA[ <> ]]> 'ADMIN' or type is null)
         ) t
         ORDER BY t.create_time
     </select>
@@ -72,15 +72,15 @@
         <include refid="Base_Column_List"/>
         <where>
             enable = 1
-            <if test="schoolId != null and schoolId != ''">
+            <if test="schoolId != null">
                 and school_id = #{schoolId}
             </if>
-            <if test="schoolId == null || schoolId == ''">
+            <if test="schoolId == null">
                 and school_id is null
             </if>
         </where>
         union
         <include refid="Base_Column_List"/>
-        where school_id is null and default_role = 1 and type <![CDATA[ <> ]]> 'ADMIN'
+        where school_id is null and default_role = 1 and (type <![CDATA[ <> ]]> 'ADMIN' or type is null)
     </select>
 </mapper>

sql/paper_library_db.sql

@@ -1,3 +1,4 @@
+USE paper_library_db;
 -- ----------------------------
 -- Table structure for basic_attachment
 -- ----------------------------
@@ -565,10 +566,11 @@ CREATE TABLE `sys_role`  (
 -- ----------------------------
 -- Records of sys_role
 -- ----------------------------
-INSERT INTO `sys_role` VALUES (1, NULL, NULL, '系统管理员', 1, 'ADMIN', NULL, NULL, NULL, NULL, 1, NULL, '系统内置');
-INSERT INTO `sys_role` VALUES (2, NULL, NULL, '档案管理员', 1, 'ARCHIVIST', 1, 1665561494512, 299492059637612544, 1666343020661, 1, 'SYS', '系统内置');
-INSERT INTO `sys_role` VALUES (3, NULL, NULL, '扫描员', 1, 'SCANNER', 1, 1665560162947, 299492059637612544, 1666338980206, 1, 'SYS', '系统内置');
-INSERT INTO `sys_role` VALUES (4, NULL, NULL, '数据校验员', 1, 'DATA_CHECKER', 1, 1665561477787, 1, 1666316593841, 1, 'SYS', '系统内置');
+INSERT INTO `sys_role` (`id`, `school_id`, `org_id`, `name`, `enable`, `type`, `create_id`, `create_time`, `update_id`, `update_time`, `default_role`, `source`, `interpret`) VALUES (1, NULL, NULL, '系统管理员', 1, 'ADMIN', NULL, NULL, NULL, NULL, 1, NULL, '系统内置');
+INSERT INTO `sys_role` (`id`, `school_id`, `org_id`, `name`, `enable`, `type`, `create_id`, `create_time`, `update_id`, `update_time`, `default_role`, `source`, `interpret`) VALUES (2, NULL, NULL, '档案管理员', 1, 'ARCHIVIST', 1, 1665561494512, 1, 1678264507708, 1, 'SYS', '系统内置');
+INSERT INTO `sys_role` (`id`, `school_id`, `org_id`, `name`, `enable`, `type`, `create_id`, `create_time`, `update_id`, `update_time`, `default_role`, `source`, `interpret`) VALUES (3, NULL, NULL, '扫描员', 1, 'SCANNER', 1, 1665560162947, 299492059637612544, 1678264452849, 1, 'SYS', '系统内置');
+INSERT INTO `sys_role` (`id`, `school_id`, `org_id`, `name`, `enable`, `type`, `create_id`, `create_time`, `update_id`, `update_time`, `default_role`, `source`, `interpret`) VALUES (4, NULL, NULL, '数据校验员', 1, 'DATA_CHECKER', 1, 1665561477787, 1, 1678264490264, 1, 'SYS', '系统内置');
+INSERT INTO `sys_role` (`id`, `school_id`, `org_id`, `name`, `enable`, `type`, `create_id`, `create_time`, `update_id`, `update_time`, `default_role`, `source`, `interpret`) VALUES (5, NULL, NULL, '学校管理员', 1, NULL, 1, 1678264654113, NULL, 1678264741096, 1, 'SYS', '系统内置');
 
 -- ----------------------------
 -- Table structure for sys_role_group_member
@@ -600,58 +602,212 @@ CREATE TABLE `sys_role_privilege`  (
 -- ----------------------------
 -- Records of sys_role_privilege
 -- ----------------------------
-INSERT INTO `sys_role_privilege` VALUES (1582980520034942978, 4, 1, 1);
-INSERT INTO `sys_role_privilege` VALUES (1582980520043331586, 4, 33, 1);
-INSERT INTO `sys_role_privilege` VALUES (1582980520047525889, 4, 34, 1);
-INSERT INTO `sys_role_privilege` VALUES (1582980520051720194, 4, 35, 1);
-INSERT INTO `sys_role_privilege` VALUES (1582980520051720195, 4, 36, 1);
-INSERT INTO `sys_role_privilege` VALUES (1582980520055914497, 4, 37, 1);
-INSERT INTO `sys_role_privilege` VALUES (1582980520055914498, 4, 19, 1);
-INSERT INTO `sys_role_privilege` VALUES (1582980520060108801, 4, 20, 1);
-INSERT INTO `sys_role_privilege` VALUES (1582980520060108802, 4, 21, 1);
-INSERT INTO `sys_role_privilege` VALUES (1582980520060108803, 4, 22, 1);
-INSERT INTO `sys_role_privilege` VALUES (1582980520064303106, 4, 23, 1);
-INSERT INTO `sys_role_privilege` VALUES (1582980520064303107, 4, 24, 1);
-INSERT INTO `sys_role_privilege` VALUES (1582980520068497409, 4, 25, 1);
-INSERT INTO `sys_role_privilege` VALUES (1582980520068497410, 4, 26, 1);
-INSERT INTO `sys_role_privilege` VALUES (1582980520068497411, 4, 410, 1);
-INSERT INTO `sys_role_privilege` VALUES (1582980520072691713, 4, 27, 1);
-INSERT INTO `sys_role_privilege` VALUES (1582980520072691714, 4, 28, 1);
-INSERT INTO `sys_role_privilege` VALUES (1582980520072691715, 4, 29, 1);
-INSERT INTO `sys_role_privilege` VALUES (1582980520076886018, 4, 31, 1);
-INSERT INTO `sys_role_privilege` VALUES (1582980520068497412, 4, 40, 1);
-INSERT INTO `sys_role_privilege` VALUES (1582980520068497413, 4, 41, 1);
-INSERT INTO `sys_role_privilege` VALUES (1582980520068497414, 4, 42, 1);
-INSERT INTO `sys_role_privilege` VALUES (1582980520068497415, 4, 43, 1);
-INSERT INTO `sys_role_privilege` VALUES (1583366560558071809, 3, 200, 1);
-INSERT INTO `sys_role_privilege` VALUES (1583366560566460417, 3, 202, 1);
-INSERT INTO `sys_role_privilege` VALUES (1583366560566460418, 3, 203, 1);
-INSERT INTO `sys_role_privilege` VALUES (1583366560570654722, 3, 204, 1);
-INSERT INTO `sys_role_privilege` VALUES (1583366560570654723, 3, 205, 1);
-INSERT INTO `sys_role_privilege` VALUES (1583383507484000257, 2, 32, 1);
-INSERT INTO `sys_role_privilege` VALUES (1583383507492388866, 2, 1, 1);
-INSERT INTO `sys_role_privilege` VALUES (1583383507492388867, 2, 34, 1);
-INSERT INTO `sys_role_privilege` VALUES (1583383507496583170, 2, 35, 1);
-INSERT INTO `sys_role_privilege` VALUES (1583383507496583171, 2, 37, 1);
-INSERT INTO `sys_role_privilege` VALUES (1583383507500777473, 2, 38, 1);
-INSERT INTO `sys_role_privilege` VALUES (1583383507504971778, 2, 39, 1);
-INSERT INTO `sys_role_privilege` VALUES (1583383507504971779, 2, 8, 1);
-INSERT INTO `sys_role_privilege` VALUES (1583383507509166082, 2, 9, 1);
-INSERT INTO `sys_role_privilege` VALUES (1583383507509166083, 2, 10, 1);
-INSERT INTO `sys_role_privilege` VALUES (1583383507513360386, 2, 11, 1);
-INSERT INTO `sys_role_privilege` VALUES (1583383507513360387, 2, 12, 1);
-INSERT INTO `sys_role_privilege` VALUES (1583383507517554690, 2, 13, 1);
-INSERT INTO `sys_role_privilege` VALUES (1583383507517554691, 2, 14, 1);
-INSERT INTO `sys_role_privilege` VALUES (1583383507521748994, 2, 15, 1);
-INSERT INTO `sys_role_privilege` VALUES (1583383507521748995, 2, 16, 1);
-INSERT INTO `sys_role_privilege` VALUES (1583383507525943298, 2, 17, 1);
-INSERT INTO `sys_role_privilege` VALUES (1583383507525943299, 2, 18, 1);
-INSERT INTO `sys_role_privilege` VALUES (1583383507530137601, 2, 410, 1);
-INSERT INTO `sys_role_privilege` VALUES (1583383507534331905, 2, 27, 1);
-INSERT INTO `sys_role_privilege` VALUES (1583383507534331906, 2, 29, 1);
-INSERT INTO `sys_role_privilege` VALUES (1583383507538526210, 2, 30, 1);
-INSERT INTO `sys_role_privilege` VALUES (1583383507538526211, 2, 44, 1);
-INSERT INTO `sys_role_privilege` VALUES (1583383507538526212, 2, 45, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1583366560558071809, 3, 200, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1583366560566460417, 3, 202, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1583366560566460418, 3, 203, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1583366560570654722, 3, 204, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1583366560570654723, 3, 205, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1583383507484000257, 2, 32, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1583383507492388866, 2, 1, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1583383507492388867, 2, 34, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1583383507496583170, 2, 35, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1583383507496583171, 2, 37, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1583383507500777473, 2, 38, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1583383507504971778, 2, 39, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1583383507504971779, 2, 8, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1583383507509166082, 2, 9, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1583383507509166083, 2, 10, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1583383507513360386, 2, 11, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1583383507513360387, 2, 12, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1583383507517554690, 2, 13, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1583383507517554691, 2, 14, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1583383507521748994, 2, 15, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1583383507521748995, 2, 16, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1583383507525943298, 2, 17, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1583383507525943299, 2, 18, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1583383507530137601, 2, 410, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1583383507534331905, 2, 27, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1583383507534331906, 2, 29, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1583383507538526210, 2, 30, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1583383507538526211, 2, 44, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1583383507538526212, 2, 45, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633385762701475841, 4, 1, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633385762709864449, 4, 33, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633385762709864450, 4, 34, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633385762714058754, 4, 35, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633385762714058755, 4, 36, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633385762714058756, 4, 37, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633385762718253058, 4, 40, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633385762718253059, 4, 41, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633385762718253060, 4, 42, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633385762722447362, 4, 43, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633385762722447363, 4, 19, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633385762722447364, 4, 20, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633385762722447365, 4, 21, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633385762726641665, 4, 22, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633385762726641666, 4, 23, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633385762726641667, 4, 24, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633385762726641668, 4, 25, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633385762730835970, 4, 26, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633385762730835971, 4, 410, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633385762730835972, 4, 27, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633385762735030274, 4, 28, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633385762735030275, 4, 29, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633385762735030276, 4, 414, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633385762735030277, 4, 31, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462361714689, 5, 256, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462374297601, 5, 512, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462374297602, 5, 1, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462374297603, 5, 257, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462374297604, 5, 513, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462378491906, 5, 2, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462378491907, 5, 258, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462378491908, 5, 514, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462378491909, 5, 259, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462378491910, 5, 4, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462378491911, 5, 260, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462382686209, 5, 5, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462382686210, 5, 6, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462382686211, 5, 262, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462382686212, 5, 263, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462382686213, 5, 8, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462386880514, 5, 264, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462386880515, 5, 9, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462391074817, 5, 10, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462391074818, 5, 11, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462391074819, 5, 267, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462395269121, 5, 12, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462395269122, 5, 13, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462395269123, 5, 14, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462395269124, 5, 15, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462395269125, 5, 16, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462395269126, 5, 17, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462395269127, 5, 18, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462399463426, 5, 19, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462399463427, 5, 20, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462399463428, 5, 533, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462399463429, 5, 21, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462403657729, 5, 534, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462403657730, 5, 22, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462403657731, 5, 23, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462403657732, 5, 535, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462407852033, 5, 24, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462407852034, 5, 25, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462407852035, 5, 26, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462407852036, 5, 27, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462407852037, 5, 28, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462407852038, 5, 29, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462412046338, 5, 30, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462412046339, 5, 31, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462412046340, 5, 32, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462412046341, 5, 33, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462412046342, 5, 34, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462416240641, 5, 35, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462416240642, 5, 36, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462416240643, 5, 37, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462416240644, 5, 549, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462416240645, 5, 38, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462420434945, 5, 550, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462420434946, 5, 551, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462420434947, 5, 39, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462420434948, 5, 552, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462420434949, 5, 40, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462420434950, 5, 553, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462420434951, 5, 41, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462424629249, 5, 42, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462424629250, 5, 554, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462424629251, 5, 43, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462424629252, 5, 555, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462424629253, 5, 44, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462428823554, 5, 556, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462428823555, 5, 45, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462428823556, 5, 569, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462428823557, 5, 570, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462433017857, 5, 77, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462433017858, 5, 78, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462433017859, 5, 79, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462433017860, 5, 80, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462433017861, 5, 81, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462433017862, 5, 83, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462433017863, 5, 84, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462437212161, 5, 85, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462437212162, 5, 87, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462441406466, 5, 88, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462441406467, 5, 89, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462441406468, 5, 90, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462441406469, 5, 91, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462441406470, 5, 92, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462441406471, 5, 93, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462445600770, 5, 94, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462445600771, 5, 358, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462445600772, 5, 359, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462445600773, 5, 362, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462445600774, 5, 363, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462449795074, 5, 364, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462449795075, 5, 365, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462449795076, 5, 111, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462449795077, 5, 112, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462449795078, 5, 377, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462449795079, 5, 378, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462453989377, 5, 379, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462453989378, 5, 380, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462453989379, 5, 381, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462453989380, 5, 382, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462453989381, 5, 647, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462453989382, 5, 648, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462458183682, 5, 649, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462458183683, 5, 400, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462458183684, 5, 401, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462458183685, 5, 402, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462458183686, 5, 403, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462458183687, 5, 404, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462462377986, 5, 405, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462462377987, 5, 406, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462462377988, 5, 407, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462462377989, 5, 408, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462462377990, 5, 409, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462462377991, 5, 410, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462462377992, 5, 411, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462466572290, 5, 414, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462466572291, 5, 184, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462466572292, 5, 185, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462466572293, 5, 186, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462466572294, 5, 462, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462470766594, 5, 217, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462470766595, 5, 218, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462470766596, 5, 219, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462470766597, 5, 220, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462470766598, 5, 221, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462470766599, 5, 222, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462474960897, 5, 223, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462474960898, 5, 225, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462474960899, 5, 226, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462474960900, 5, 227, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462474960901, 5, 228, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462474960902, 5, 229, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462474960903, 5, 230, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462479155201, 5, 231, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462479155202, 5, 232, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462479155203, 5, 233, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462479155204, 5, 234, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462479155205, 5, 235, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462479155206, 5, 243, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462479155207, 5, 244, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462483349506, 5, 757, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462483349507, 5, 245, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462483349508, 5, 246, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462483349509, 5, 758, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462483349510, 5, 247, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462483349511, 5, 248, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462487543810, 5, 249, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462487543811, 5, 250, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462487543812, 5, 251, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462487543813, 5, 252, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462487543814, 5, 253, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462487543815, 5, 254, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462491738114, 5, 510, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462491738115, 5, 255, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1633386462491738116, 5, 511, 1);
 
 -- ----------------------------
 -- Table structure for sys_setting