Merge branch 'V0.0.2' of http://10.87.10.227:4000/jzyd_yyds/soc into V0.0.2

project_data/sql/0.0.2/soc/soc.sql

@@ -196,7 +196,7 @@ INSERT INTO sys_dict_data (dict_sort, dict_label, dict_value, dict_type, css_cla
 
 
 -- 公告通知start
-delete from sys_dict_type where dict_type in('messag_type','message_status');
+delete from sys_dict_type where dict_type in('messag_type','message_status') and dict_name in('消息类型','消息状态');
 INSERT INTO `sys_dict_type`( `dict_name`, `dict_type`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES ( '消息类型', 'messag_type', '0', '超级管理员', '2023-09-13 17:03:11', '超级管理员', '2023-09-13 17:07:06', NULL);
 INSERT INTO `sys_dict_type`( `dict_name`, `dict_type`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES ( '消息状态', 'message_status', '0', '超级管理员', '2023-09-13 17:08:11', '', NULL, NULL);
 
@@ -206,14 +206,14 @@ INSERT INTO `sys_dict_data`( `dict_sort`, `dict_label`, `dict_value`, `dict_type
 INSERT INTO `sys_dict_data`( `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES ( 0, '待发布', '0', 'message_status', NULL, 'default', 'N', '0', '超级管理员', '2023-09-13 17:09:11', '', NULL, NULL);
 INSERT INTO `sys_dict_data`( `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES ( 0, '已发布', '1', 'message_status', NULL, 'default', 'N', '0', '超级管理员', '2023-09-13 17:09:19', '', NULL, NULL);
 
-delete from sys_menu where id in(2196,2208,2209,2210,2211,2212,2213);
-INSERT INTO `sys_menu`(`id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `platform_type`, `icon`, `image_path`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (2196, '公告通知', 2168, 1, 'core/message', 'core/message/index', NULL, 1, 0, 'C', '0', '0', 'core:notification:list', '1', 'dashboard', NULL, '超级管理员', '2023-09-13 17:50:26', '超级管理员', '2023-09-15 16:47:45', '');
-INSERT INTO `sys_menu`(`id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `platform_type`, `icon`, `image_path`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (2208, '详情', 2196, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'core:notification:query', '1', '#', NULL, '超级管理员', '2023-09-19 15:17:27', '', NULL, '');
-INSERT INTO `sys_menu`(`id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `platform_type`, `icon`, `image_path`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (2209, '编辑', 2196, 2, '', NULL, NULL, 1, 0, 'F', '0', '0', 'core:notification:edit', '1', '#', NULL, '超级管理员', '2023-09-19 15:17:56', '', NULL, '');
-INSERT INTO `sys_menu`(`id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `platform_type`, `icon`, `image_path`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (2210, '新增', 2196, 3, '', NULL, NULL, 1, 0, 'F', '0', '0', 'core:notification:add', '1', '#', NULL, '超级管理员', '2023-09-19 15:18:18', '', NULL, '');
-INSERT INTO `sys_menu`(`id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `platform_type`, `icon`, `image_path`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (2211, '删除', 2196, 4, '', NULL, NULL, 1, 0, 'F', '0', '0', 'core:notification:remove', '1', '#', NULL, '超级管理员', '2023-09-19 15:18:42', '', NULL, '');
-INSERT INTO `sys_menu`(`id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `platform_type`, `icon`, `image_path`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (2212, '发布', 2196, 5, '', NULL, NULL, 1, 0, 'F', '0', '0', 'core:notification:publish', '1', '#', NULL, '超级管理员', '2023-09-19 15:19:03', '', NULL, '');
-INSERT INTO `sys_menu`(`id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `platform_type`, `icon`, `image_path`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (2213, '取消发布', 2196, 6, '', NULL, NULL, 1, 0, 'F', '0', '0', 'core:notification:cancelPublish', '1', '#', NULL, '超级管理员', '2023-09-19 15:19:25', '', NULL, '');
+delete from sys_menu where menu_name in('公告通知','公告通知详情','公告通知编辑','新增公告通知','删除公告通知','发布公告通知','取消发布');
+INSERT INTO `sys_menu`( `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `platform_type`, `icon`, `image_path`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (2196, '公告通知', 2168, 1, 'core/message', 'core/message/index', NULL, 1, 0, 'C', '0', '0', 'core:notification:list', '1', 'dashboard', NULL, '超级管理员', '2023-09-13 17:50:26', '超级管理员', '2023-09-15 16:47:45', '');
+INSERT INTO `sys_menu`( `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `platform_type`, `icon`, `image_path`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (2208, '公告通知详情', 2196, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'core:notification:query', '1', '#', NULL, '超级管理员', '2023-09-19 15:17:27', '', NULL, '');
+INSERT INTO `sys_menu`( `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `platform_type`, `icon`, `image_path`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (2209, '公告通知编辑', 2196, 2, '', NULL, NULL, 1, 0, 'F', '0', '0', 'core:notification:edit', '1', '#', NULL, '超级管理员', '2023-09-19 15:17:56', '', NULL, '');
+INSERT INTO `sys_menu`( `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `platform_type`, `icon`, `image_path`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (2210, '新增公告通知', 2196, 3, '', NULL, NULL, 1, 0, 'F', '0', '0', 'core:notification:add', '1', '#', NULL, '超级管理员', '2023-09-19 15:18:18', '', NULL, '');
+INSERT INTO `sys_menu`( `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `platform_type`, `icon`, `image_path`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (2211, '删除公告通知', 2196, 4, '', NULL, NULL, 1, 0, 'F', '0', '0', 'core:notification:remove', '1', '#', NULL, '超级管理员', '2023-09-19 15:18:42', '', NULL, '');
+INSERT INTO `sys_menu`( `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `platform_type`, `icon`, `image_path`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (2212, '发布公告通知', 2196, 5, '', NULL, NULL, 1, 0, 'F', '0', '0', 'core:notification:publish', '1', '#', NULL, '超级管理员', '2023-09-19 15:19:03', '', NULL, '');
+INSERT INTO `sys_menu`( `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `platform_type`, `icon`, `image_path`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (2213, '取消发布', 2196, 6, '', NULL, NULL, 1, 0, 'F', '0', '0', 'core:notification:cancelPublish', '1', '#', NULL, '超级管理员', '2023-09-19 15:19:25', '', NULL, '');
 
 DROP TABLE IF EXISTS `core_announcement_notification`;
 CREATE TABLE `core_announcement_notification`  (
@@ -407,16 +407,13 @@ INSERT INTO `core_weather_city`(`AREACODE`, `AREAID`, `NAMEEN`, `NAMECN`, `DISTR
 
 -- 天气预警end
 
--- Web预案演练菜单
-delete from sys_menu where menu_name in ('预案演练管理','演练库管理','演练计划管理','演练任务管理');
+-- Web演练库按钮及权限
+delete from sys_menu where menu_name in ('预案演练管理','演练');
 INSERT INTO sys_menu (id, menu_name, parent_id, order_num, path, component, query, is_frame, is_cache, menu_type, visible, status, perms, platform_type, icon, image_path, create_by, create_time, update_by, update_time, remark) VALUES (2319, '预案演练管理', 0, 6, '/drill', null, null, 1, 0, 'M', '0', '0', null, '1', 'dashboard', null, '超级管理员', now(), '', null, '');
-INSERT INTO sys_menu (id, menu_name, parent_id, order_num, path, component, query, is_frame, is_cache, menu_type, visible, status, perms, platform_type, icon, image_path, create_by, create_time, update_by, update_time, remark) VALUES (2320, '演练库管理', 2205, 1, '/dictionary', 'core/drill/drillDictionary/index', null, 1, 0, 'C', '0', '0', 'core:drillDictionary:list', '1', 'component', null, '超级管理员', now(), '超级管理员', now(), '');
-INSERT INTO sys_menu (id, menu_name, parent_id, order_num, path, component, query, is_frame, is_cache, menu_type, visible, status, perms, platform_type, icon, image_path, create_by, create_time, update_by, update_time, remark) VALUES (2321, '演练计划管理', 2205, 2, '/drillPlan', 'core/drill/plan/index', null, 1, 0, 'C', '0', '0', 'core:drillPlan:list', '1', 'documentation', null, '超级管理员', now(), '', null, '');
-INSERT INTO sys_menu (id, menu_name, parent_id, order_num, path, component, query, is_frame, is_cache, menu_type, visible, status, perms, platform_type, icon, image_path, create_by, create_time, update_by, update_time, remark) VALUES (2322, '演练任务管理', 2205, 3, '/drillTask', 'core/drill/task/index', null, 1, 0, 'C', '0', '0', 'core:drillTask:list', '1', 'druid', null, '超级管理员', now(), '', null, '');
-
+INSERT INTO sys_menu (id, menu_name, parent_id, order_num, path, component, query, is_frame, is_cache, menu_type, visible, status, perms, platform_type, icon, image_path, create_by, create_time, update_by, update_time, remark) VALUES (2311, '演练', 0, 12, '/', null, null, 1, 0, 'M', '0', '0', null, '0', '#', null, '超级管理员', now(), '', null, '');
 
--- Web演练库按钮及权限
-delete from sys_menu where menu_name in ('演练库新增','演练库查询','演练库编辑','演练库详情','演练库删除');
+delete from sys_menu where menu_name in ('演练库管理','演练库新增','演练库查询','演练库编辑','演练库详情','演练库删除');
+INSERT INTO sys_menu (id, menu_name, parent_id, order_num, path, component, query, is_frame, is_cache, menu_type, visible, status, perms, platform_type, icon, image_path, create_by, create_time, update_by, update_time, remark) VALUES (2320, '演练库管理', 2319, 1, '/dictionary', 'core/drill/drillDictionary/index', null, 1, 0, 'C', '0', '0', 'core:drillDictionary:list', '1', 'component', null, '超级管理员', now(), '超级管理员', now(), '');
 INSERT INTO sys_menu (id, menu_name, parent_id, order_num, path, component, query, is_frame, is_cache, menu_type, visible, status, perms, platform_type, icon, image_path, create_by, create_time, update_by, update_time, remark) VALUES (2220, '演练库新增', 2320, 1, '', null, null, 1, 0, 'F', '0', '0', 'core:drillDictionary:add', '1', '#', null, '超级管理员', now(), '', null, '');
 INSERT INTO sys_menu (id, menu_name, parent_id, order_num, path, component, query, is_frame, is_cache, menu_type, visible, status, perms, platform_type, icon, image_path, create_by, create_time, update_by, update_time, remark) VALUES (2221, '演练库查询', 2320, 2, '', null, null, 1, 0, 'F', '0', '0', 'core:drillDictionary:list', '1', '#', null, '超级管理员', now(), '', null, '');
 INSERT INTO sys_menu (id, menu_name, parent_id, order_num, path, component, query, is_frame, is_cache, menu_type, visible, status, perms, platform_type, icon, image_path, create_by, create_time, update_by, update_time, remark) VALUES (2222, '演练库编辑', 2320, 3, '', null, null, 1, 0, 'F', '0', '0', 'core:drillDictionary:edit', '1', '#', null, '超级管理员', now(), '', null, '');
@@ -424,27 +421,231 @@ INSERT INTO sys_menu (id, menu_name, parent_id, order_num, path, component, quer
 INSERT INTO sys_menu (id, menu_name, parent_id, order_num, path, component, query, is_frame, is_cache, menu_type, visible, status, perms, platform_type, icon, image_path, create_by, create_time, update_by, update_time, remark) VALUES (2224, '演练库删除', 2320, 5, '', null, null, 1, 0, 'F', '0', '0', 'core:drillDictionary:remove', '1', '#', null, '超级管理员', now(), '', null, '');
 
 -- Web演练计划按钮及权限
-delete from sys_menu where menu_name in ('演练计划新增','演练计划列表','演练计划下发','演练计划编辑','演练计划删除');
+delete from sys_menu where menu_name in ('演练计划管理','演练计划新增','演练计划列表','演练计划下发','演练计划编辑','演练计划删除','演练计划详情');
+INSERT INTO sys_menu (id, menu_name, parent_id, order_num, path, component, query, is_frame, is_cache, menu_type, visible, status, perms, platform_type, icon, image_path, create_by, create_time, update_by, update_time, remark) VALUES (2321, '演练计划管理', 2319, 2, '/drillPlan', 'core/drill/plan/index', null, 1, 0, 'C', '0', '0', 'core:drillPlan:list', '1', 'documentation', null, '超级管理员', now(), '超级管理员', now(), '');
 INSERT INTO sys_menu (id, menu_name, parent_id, order_num, path, component, query, is_frame, is_cache, menu_type, visible, status, perms, platform_type, icon, image_path, create_by, create_time, update_by, update_time, remark) VALUES (2225, '演练计划新增', 2321, 1, '', null, null, 1, 0, 'F', '0', '0', 'core:drillPlan:add', '1', null, null, '超级管理员', now(), '超级管理员', now(), '');
 INSERT INTO sys_menu (id, menu_name, parent_id, order_num, path, component, query, is_frame, is_cache, menu_type, visible, status, perms, platform_type, icon, image_path, create_by, create_time, update_by, update_time, remark) VALUES (2226, '演练计划列表', 2321, 2, '', null, null, 1, 0, 'F', '0', '0', 'core:drillPlan:list', '1', null, null, '超级管理员', now(), '', null, '');
 INSERT INTO sys_menu (id, menu_name, parent_id, order_num, path, component, query, is_frame, is_cache, menu_type, visible, status, perms, platform_type, icon, image_path, create_by, create_time, update_by, update_time, remark) VALUES (2227, '演练计划下发', 2321, 3, '', null, null, 1, 0, 'F', '0', '0', 'core:drillPlan:publish', '1', null, null, '超级管理员', now(), '超级管理员', now(), '');
 INSERT INTO sys_menu (id, menu_name, parent_id, order_num, path, component, query, is_frame, is_cache, menu_type, visible, status, perms, platform_type, icon, image_path, create_by, create_time, update_by, update_time, remark) VALUES (2228, '演练计划编辑', 2321, 4, '', null, null, 1, 0, 'F', '0', '0', 'core:drillPlan:edit', '1', null, null, '超级管理员', now(), '', null, '');
 INSERT INTO sys_menu (id, menu_name, parent_id, order_num, path, component, query, is_frame, is_cache, menu_type, visible, status, perms, platform_type, icon, image_path, create_by, create_time, update_by, update_time, remark) VALUES (2229, '演练计划删除', 2321, 5, '', null, null, 1, 0, 'F', '0', '0', 'core:drillPlan:remove', '1', null, null, '超级管理员', now(), '', null, '');
+INSERT INTO sys_menu (id, menu_name, parent_id, order_num, path, component, query, is_frame, is_cache, menu_type, visible, status, perms, platform_type, icon, image_path, create_by, create_time, update_by, update_time, remark) VALUES (2338, '演练计划详情', 2321, 6, '', null, null, 1, 0, 'F', '0', '0', 'core:drillPlan:query', '1', null, null, '超级管理员', now(), '', null, '');
 
 -- Web演练任务按钮及权限
-delete from sys_menu where menu_name in ('演练任务登记','演练任务详情','演练任务签名','演练任务评价');
+delete from sys_menu where menu_name in ('演练任务管理','演练任务登记','演练任务详情','演练任务签名','演练任务评价');
+INSERT INTO sys_menu (id, menu_name, parent_id, order_num, path, component, query, is_frame, is_cache, menu_type, visible, status, perms, platform_type, icon, image_path, create_by, create_time, update_by, update_time, remark) VALUES (2322, '演练任务管理', 2319, 3, '/drillTask', 'core/drill/task/index', null, 1, 0, 'C', '0', '0', 'core:drillTask:list', '1', 'druid', null, '超级管理员', now(), '超级管理员', now(), '');
 INSERT INTO sys_menu (id, menu_name, parent_id, order_num, path, component, query, is_frame, is_cache, menu_type, visible, status, perms, platform_type, icon, image_path, create_by, create_time, update_by, update_time, remark) VALUES (2215, '演练任务登记', 2322, 1, '', null, null, 1, 0, 'F', '0', '0', 'core:drillTask:edit', '1', '#', null, '超级管理员', now(), '', null, '');
 INSERT INTO sys_menu (id, menu_name, parent_id, order_num, path, component, query, is_frame, is_cache, menu_type, visible, status, perms, platform_type, icon, image_path, create_by, create_time, update_by, update_time, remark) VALUES (2216, '演练任务详情', 2322, 2, '', null, null, 1, 0, 'F', '0', '0', 'core:drillTask:query', '1', '#', null, '超级管理员', now(), '', null, '');
 INSERT INTO sys_menu (id, menu_name, parent_id, order_num, path, component, query, is_frame, is_cache, menu_type, visible, status, perms, platform_type, icon, image_path, create_by, create_time, update_by, update_time, remark) VALUES (2217, '演练任务签名', 2322, 3, '', null, null, 1, 0, 'F', '0', '0', 'core:drillTask:sign', '1', '#', null, '超级管理员', now(), '', null, '');
 INSERT INTO sys_menu (id, menu_name, parent_id, order_num, path, component, query, is_frame, is_cache, menu_type, visible, status, perms, platform_type, icon, image_path, create_by, create_time, update_by, update_time, remark) VALUES (2218, '演练任务评价', 2322, 4, '', null, null, 1, 0, 'F', '0', '0', 'core:drillTask:evaluate', '1', '#', null, '超级管理员', now(), '', null, '');
 
 -- App端预案演练登记菜单目录
-delete from sys_menu where menu_name in ('演练','演练登记','演练统计排名','优秀案例管理','优秀案例学习');
-INSERT INTO sys_menu (id, menu_name, parent_id, order_num, path, component, query, is_frame, is_cache, menu_type, visible, status, perms, platform_type, icon, image_path, create_by, create_time, update_by, update_time, remark) VALUES (2311, '演练', 0, 12, '/', null, null, 1, 0, 'M', '0', '0', null, '0', '#', null, '超级管理员', now(), '', null, '');
-INSERT INTO sys_menu (id, menu_name, parent_id, order_num, path, component, query, is_frame, is_cache, menu_type, visible, status, perms, platform_type, icon, image_path, create_by, create_time, update_by, update_time, remark) VALUES (2312, '演练登记', 2311, 1, '/rehearsalTask', null, null, 1, 0, 'C', '0', '0', '', '0', '#', null, '超级管理员', now(), '超级管理员', now(), '');
-INSERT INTO sys_menu (id, menu_name, parent_id, order_num, path, component, query, is_frame, is_cache, menu_type, visible, status, perms, platform_type, icon, image_path, create_by, create_time, update_by, update_time, remark) VALUES (2313, '演练统计排名', 2311, 1, '/drillStatistics', null, null, 1, 0, 'C', '0', '0', null, '0', '#', null, '超级管理员', now(), '', null, '');
-INSERT INTO sys_menu (id, menu_name, parent_id, order_num, path, component, query, is_frame, is_cache, menu_type, visible, status, perms, platform_type, icon, image_path, create_by, create_time, update_by, update_time, remark) VALUES (2314, '优秀案例管理', 2311, 2, '/rehearsaloptimal', null, null, 1, 0, 'M', '0', '0', '', '0', null, null, '超级管理员', now(), '超级管理员', now(), '');
-INSERT INTO sys_menu (id, menu_name, parent_id, order_num, path, component, query, is_frame, is_cache, menu_type, visible, status, perms, platform_type, icon, image_path, create_by, create_time, update_by, update_time, remark) VALUES (2315, '优秀案例学习', 2311, 4, '/rehearsallearning', null, null, 1, 0, 'M', '0', '0', '', '0', null, null, '超级管理员', now(), '超级管理员', now(), '');
+delete from sys_menu where menu_name in ('演练登记','演练统计排名','优秀案例管理','优秀案例学习');
+INSERT INTO sys_menu (id, menu_name, parent_id, order_num, path, component, query, is_frame, is_cache, menu_type, visible, status, perms, platform_type, icon, image_path, create_by, create_time, update_by, update_time, remark) VALUES (2312, '演练登记', 2311, 1, '/rehearsalTask', null, null, 1, 0, 'C', '0', '0', '', '0', 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFYAAABWCAMAAABiiJHFAAAAM1BMVEVHcEzYvXHYvXHYvXHYvXHYvXHYvXHYvXHYvXHYvXHYvXHYvXHYvXHYvXHYvXHYvXHYvXF4gE2CAAAAEHRSTlMA0HAgQLDwgMAQYKCQUDDgVczG7QAAAAlwSFlzAAALEgAACxIB0t1+/AAAAhVJREFUWIXtmNtyhSAMRVFAUVH5/6/tGIkiBjmAnXZa9lsHXIVctvGwqqqqqoBaUyI10NSliGqMorF9Idb8AFb26dJrDCvy6lk+YwNhj2r5Hiyr2H+G5W2vVN/yV7FCYZ8qv23yscPkGoC++mA2dmiuxtJcuNlYZTzJN7DEq2N8AdvdsWs5dqR82zluJlZS2KkY21BYZ3cmlqK6oN+FXSlqU4wlU+Y0RCaWHKTKC2wg2qFzXCETS41SvbOci/UN7JKwAgfjXhheMkbvvM1LNr7tOA7ctd5SCZaxWSullJ5vC2XYoP4StqGXmJDqLnk2b2S+NZpc0pQjOB9NQ2Qa37ZetMBZA1T0sHkvvEfsVVCfpCvugqHJjhAJWB5wLxS8JcdUrGShl7lVB6FNxUKuybfuZceUhoWzPH8Lw33mNOx0HiUoqLE1CbtEEmawVnQYe8/MGkuYwcbkYaxv//YgjwnDK227JI1li9f4MMfzGHXvdz5N9++UB4Xs4NSagkNhZCi8ber7u4KIsEBB5WDCJqpZZrsWpy5n3mC6wA8RQWHFftwu8JuSI+fp0UnYSra2GM+dn2KhcTGiLY21rRIqLQoLEcOQDDQWGztaW+fT82Eh8C9o7IyX+RQL1SiP5wNYe51o6R5PaydhTcCNxWFvSwSL14Zw4QjeBsZxwT6Pwi7oHG7/2OpyIH7LO/fHK7eqqur3izH2BalxfxDJImssAAAAAElFTkSuQmCC', null, '超级管理员', now(), '超级管理员',now(), '');
+INSERT INTO sys_menu (id, menu_name, parent_id, order_num, path, component, query, is_frame, is_cache, menu_type, visible, status, perms, platform_type, icon, image_path, create_by, create_time, update_by, update_time, remark) VALUES (2313, '演练统计排名', 2311, 1, '/drillStatistics', null, null, 1, 0, 'C', '0', '0', '', '0', 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFYAAABWCAMAAABiiJHFAAAAM1BMVEVHcEzB0pLB0pLB0pLB0pLB0pLB0pLB0pLB0pLB0pLB0pLB0pLB0pLB0pLB0pLB0pLB0pJW8V+EAAAAEHRSTlMAYLDgEPDQwIBAMKBwIJBQkhN9vAAAAAlwSFlzAAALEgAACxIB0t1+/AAAAoZJREFUWIXtmNmSrCAMhlFZ4oLm/Z92Stkh2kJbp07N+F/1Ih8SsgF79epfS68SEeXCH50X0Ep0D1JnDFofowLG2h6iapFgRdXgCdXJPwumIs2roVdB3lJ8QJxorMqwM/FMlz2zE8eJsR4RRxqbjaBWNebPsIPYzydvcRO7DxeZEewi5Zmri8/YHQHZb9NwST3sE4vwXEWZkMsrarEdxBaQWMYXuAh2PnyywQn2g5J9FpQbNmFjMwgydtuwbHR2UHTINGIZ21alFJzEYTv2Wv8Rls+Jg/WELzZg92BJREROA9amjD2TnAZEPdb57O6vq/1cJPJqLHf5a4yK2vA11pfHGFu8bjXWpxkWB3H+urXYFBRyTpYZarG+PPbHV0y/tmK155iSElw49d1KLGSrDvVn+QYb6oLOppFfYKcQs12GtfM0YaMcc9SaOD0kVqjC8rhDEFOadBJfUIW198wvUVIlKq3kAtJUdvjCiqSkH030gTM9BlVwubztc/LbXaQP1yXlvRIiDH7ABTZ8omygypFglrERjZSV9H/1Bdb83hHYLh9BbdkkyGbFBK4g1gk2pnmCLVu7BYgDl+ntZwprtyO0nhV+a3ATiTXGHZJn72G5G0lhN/SbVok1KXulsWbO4Ou1WE0FxWbnEn5DKmwrbT+vc6qwkw7BeWpSzQTGFe3rCuf6hwOMEEd7Sw8GjmZTze2zw02serEv9sW+2F+KLbotvcCiy2crsHuGHyBo8+3H+RpuYLe8MPlzBtHa3ccWdfSitavBsi2+uTxu7cxMZ1eBN7Gl+N5Sr+cXYY3YT7L3t4vDXjhNjbSjGb58hmrPHas9P5G3dm0a1/mIIQ49PGSCV39UjLEf/p1q4sZjU5oAAAAASUVORK5CYII=', null, '超级管理员', now(), '超级管理员', now(), '');
+INSERT INTO sys_menu (id, menu_name, parent_id, order_num, path, component, query, is_frame, is_cache, menu_type, visible, status, perms, platform_type, icon, image_path, create_by, create_time, update_by, update_time, remark) VALUES (2314, '优秀案例管理', 2311, 2, '/rehearsaloptimal', null, null, 1, 0, 'M', '0', '0', '', '0', 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFYAAABWCAMAAABiiJHFAAAAM1BMVEVHcEymgKWmgKWmgKWmgKWmgKWmgKWmgKWmgKWmgKWmgKWmgKWmgKWmgKWmgKWmgKWmgKV36H0vAAAAEHRSTlMA0KAg8BAwQMCAYOCQULBwyOgprQAAAAlwSFlzAAALEgAACxIB0t1+/AAAAllJREFUWIXtmFuSoCAMRQERiM/sf7VTPASCoNjdX1PcX/EYk0uCsqGhoaE/kgJQH0jzDrBMr8uURJS6G7qhk5jfqYi4dFI5Bq2Pb2ipxq6FLqzBKP5CPRgT9rU6qAtmagcySURus7RJxO1TsIhrc9ms9VVTrV+KYIVE73boFMV22+dbtBSrO9TASoIlWRPYoYYtjvxO4jDdQ0WsY8nNZAep32DZllYc9IpA5OZRHGXT6jGFR+nHV2doNO2Lu+sK672H/A5L9lA3dkE5tbFzZs2ygz1htfVWE6uIbw3N7gNWSVvgFpZSQ5NqYlOmJumWNrDzWrqQ9DyKPVdE4cEzR6naJQPPWufUIPPSEewe8qT9QHFX6tg5pMBkfVc0sJNEqW3AaJYD8WRtLGRvHnvDXMdyxN3aas0fXsde9VqyR4Q4SqyIadcmtaQqNo4xlbecbPAk7FKfn1VsHGMud5g/JGGv/MvaNqxhI8hfil5LHrPY8EqVjtHAbpQTa5ay4JJQ3dYP2Bieb5mxZqlOr6O7gk3Nnyu6jeW2dE7gCtZF5yOW+0WNmZDXw/UOYFrHuQrW9e7zSm+IdY4xGxAmWoU3knHHOh/IcrpeOz9JGgPQSvEd6yaYuGGv3YlcAHwvmTetvmMZUzsAnA0Q1V5ihXdoDRvlyiWeBrosB7rx++AJ+5NTjcOqP8fuvmmWByKyRjZARMVJexIbKw/jxZqp5yBa90roBOGF+z5iOhSwbGAHdmAHdmAHNsmfinkYh1/+ID7K/7PbPf7xc/sj9wSwnwUaoPPv4dDQ0H8jxtg/vgNYlsZOPYcAAAAASUVORK5CYII=', null, '超级管理员', now(), '超级管理员', now(), '');
+INSERT INTO sys_menu (id, menu_name, parent_id, order_num, path, component, query, is_frame, is_cache, menu_type, visible, status, perms, platform_type, icon, image_path, create_by, create_time, update_by, update_time, remark) VALUES (2315, '优秀案例学习', 2311, 4, '/rehearsallearning', null, null, 1, 0, 'M', '0', '0', '', '0', 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFcAAABWCAMAAACNSvr7AAAAM1BMVEVHcEx3max3max3max3max3max3max3max3max3max3max3max3max3max3max3max3mayxYUqyAAAAEHRSTlMAMNAgEPBggMBAUOCQoLBwPe7hCQAAAAlwSFlzAAALEgAACxIB0t1+/AAAAjBJREFUWIXtmOtyhCAMhVFBQLzs+z9tRyRIFFwJbKed9fza2tmvkOQksezRo0fFGlRSM6fDh9eFFjpXXnHlt3FnHcpU4/bxmBdzBSo18bV5+5160FpPdbjD6bn5QD0opcyfiW+npVy074B1uFyCR9u+IncRwZeMrsTl8+Fr65H1Fbe/QWWsjX6vkatGeKTkrnvY8YQN61bZn9vuFipU9MLG18WGJQxKFY2gn4w2BgRsF8+Mcb9ebzPlUxlbEinvPJeEZVOC6zInqb0gHl5f+ryhYd9xyfoUN+aKVbqQ2ye4BSujFRdR7FyITRVaaRgSB1bF2OgGLUqja3VKnaCa4QjGoWgrYRnrguQJWSUIQJbWeGLua1IfuXF+0nmRzFOqnZFm5a6LbYky20GJYbypoKWFxxVriNGmRredCShbpsKxNFKxqJNtHTfcAQWVO5+5KMLEYuMI0py5tE0Hr1Du0njs00otzBpMHuyTewv0QQ1CuD0EDyXSmMOD2A1gHPNX/pp+nMPwGAWH8o8nPC3b+C3MNSMmcMBWAd5bhz0728u+5fQ48y6b7gU738tQUIIdzuW4IzEQkLWRxc8L98n0ss9a597Q3IF5C5XrPmR6GVqOgosLe+LOZxP+ct6qtmdtbzUTZ42vaeUdkuVlGBTrafYaHnerKH+lrHEErpqOrTHgQqvI8LJ/124uuFAyGV6GMFj3JrmuhDPGEXfrjS2uIbbvrJfni/1IasKPHv0DMcZ+AB6xa3Jz3P3pAAAAAElFTkSuQmCC', null, '超级管理员', now(), '超级管理员', now(), '');
+
+-- 演练相关菜单权限
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (115, 2216);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (115, 2217);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (115, 2218);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (115, 2220);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (115, 2221);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (115, 2222);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (115, 2223);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (115, 2224);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (115, 2225);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (115, 2226);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (115, 2227);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (115, 2228);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (115, 2229);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (115, 2311);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (115, 2312);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (115, 2313);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (115, 2314);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (115, 2315);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (115, 2319);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (115, 2320);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (115, 2321);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (115, 2322);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (115, 2338);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (116, 2216);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (116, 2217);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (116, 2218);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (116, 2220);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (116, 2221);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (116, 2222);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (116, 2223);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (116, 2224);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (116, 2225);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (116, 2226);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (116, 2227);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (116, 2228);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (116, 2229);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (116, 2311);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (116, 2312);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (116, 2313);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (116, 2314);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (116, 2315);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (116, 2319);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (116, 2320);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (116, 2321);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (116, 2322);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (116, 2338);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (117, 2216);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (117, 2218);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (117, 2220);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (117, 2221);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (117, 2222);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (117, 2223);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (117, 2224);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (117, 2225);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (117, 2226);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (117, 2227);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (117, 2228);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (117, 2229);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (117, 2311);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (117, 2312);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (117, 2313);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (117, 2314);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (117, 2315);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (117, 2319);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (117, 2320);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (117, 2321);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (117, 2322);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (117, 2338);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (118, 2216);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (118, 2218);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (118, 2220);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (118, 2221);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (118, 2222);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (118, 2223);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (118, 2224);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (118, 2225);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (118, 2226);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (118, 2227);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (118, 2228);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (118, 2229);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (118, 2311);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (118, 2312);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (118, 2313);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (118, 2314);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (118, 2315);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (118, 2319);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (118, 2320);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (118, 2321);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (118, 2322);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (118, 2338);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (119, 2215);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (119, 2216);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (119, 2217);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (119, 2218);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (119, 2220);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (119, 2221);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (119, 2222);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (119, 2223);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (119, 2224);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (119, 2225);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (119, 2226);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (119, 2227);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (119, 2228);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (119, 2229);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (119, 2311);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (119, 2312);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (119, 2313);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (119, 2314);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (119, 2315);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (119, 2319);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (119, 2320);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (119, 2321);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (119, 2322);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (119, 2338);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (120, 2215);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (120, 2216);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (120, 2217);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (120, 2218);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (120, 2220);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (120, 2221);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (120, 2222);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (120, 2223);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (120, 2224);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (120, 2225);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (120, 2226);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (120, 2227);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (120, 2228);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (120, 2229);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (120, 2311);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (120, 2312);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (120, 2313);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (120, 2314);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (120, 2315);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (120, 2319);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (120, 2320);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (120, 2321);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (120, 2322);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (120, 2338);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (121, 2216);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (121, 2217);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (121, 2220);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (121, 2221);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (121, 2222);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (121, 2223);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (121, 2224);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (121, 2225);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (121, 2226);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (121, 2228);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (121, 2229);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (121, 2311);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (121, 2312);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (121, 2315);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (121, 2319);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (121, 2320);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (121, 2321);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (121, 2322);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (121, 2338);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (122, 2215);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (122, 2216);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (122, 2217);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (122, 2220);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (122, 2221);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (122, 2222);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (122, 2223);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (122, 2224);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (122, 2225);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (122, 2226);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (122, 2227);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (122, 2228);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (122, 2229);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (122, 2311);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (122, 2312);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (122, 2315);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (122, 2319);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (122, 2320);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (122, 2321);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (122, 2322);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (122, 2338);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (128, 2215);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (128, 2216);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (128, 2217);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (128, 2220);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (128, 2221);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (128, 2222);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (128, 2223);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (128, 2224);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (128, 2225);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (128, 2226);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (128, 2227);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (128, 2228);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (128, 2229);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (128, 2311);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (128, 2312);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (128, 2315);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (128, 2319);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (128, 2320);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (128, 2321);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (128, 2322);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (128, 2338);
+
 
 
 -- 检查任务表
@@ -1028,9 +1229,9 @@ INSERT INTO `sys_dict_type` (`dict_name`, `dict_type`, `status`, `create_by`, `c
 INSERT INTO `sys_dict_type` (`dict_name`, `dict_type`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES ( '问题整改状态', 'question_reform_status', '0', '超级管理员', '2023-09-13 18:15:18', '', NULL, NULL);
 
 DELETE from `sys_dict_data` WHERE dict_type in ('question_confirm_status','question_reform_status');
-INSERT INTO `sys_dict_data` (`dict_code`, `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (360, 0, '待确认', '0', 'question_confirm_status', NULL, 'default', 'N', '0', '超级管理员', '2023-09-13 18:15:44', '', NULL, NULL);
-INSERT INTO `sys_dict_data` (`dict_code`, `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (361, 1, '提出异议', '1', 'question_confirm_status', NULL, 'default', 'N', '0', '超级管理员', '2023-09-13 18:16:01', '', NULL, NULL);
-INSERT INTO `sys_dict_data` (`dict_code`, `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (362, 2, '已确认', '2', 'question_confirm_status', NULL, 'default', 'N', '0', '超级管理员', '2023-09-13 18:16:18', '', NULL, NULL);
-INSERT INTO `sys_dict_data` (`dict_code`, `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (363, 3, '已关闭', '3', 'question_confirm_status', NULL, 'default', 'N', '0', '超级管理员', '2023-09-13 18:16:30', '', NULL, NULL);
-INSERT INTO `sys_dict_data` (`dict_code`, `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (364, 0, '未整改', '10', 'question_reform_status', NULL, 'default', 'N', '0', '超级管理员', '2023-09-13 18:17:38', '', NULL, NULL);
-INSERT INTO `sys_dict_data` (`dict_code`, `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (365, 1, '已整改', '11', 'question_reform_status', NULL, 'default', 'N', '0', '超级管理员', '2023-09-13 18:17:47', '', NULL, NULL);
+INSERT INTO `sys_dict_data` (`dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES ( 0, '待确认', '0', 'question_confirm_status', NULL, 'default', 'N', '0', '超级管理员', '2023-09-13 18:15:44', '', NULL, NULL);
+INSERT INTO `sys_dict_data` (`dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (1, '提出异议', '1', 'question_confirm_status', NULL, 'default', 'N', '0', '超级管理员', '2023-09-13 18:16:01', '', NULL, NULL);
+INSERT INTO `sys_dict_data` (`dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES ( 2, '已确认', '2', 'question_confirm_status', NULL, 'default', 'N', '0', '超级管理员', '2023-09-13 18:16:18', '', NULL, NULL);
+INSERT INTO `sys_dict_data` (`dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES ( 3, '已关闭', '3', 'question_confirm_status', NULL, 'default', 'N', '0', '超级管理员', '2023-09-13 18:16:30', '', NULL, NULL);
+INSERT INTO `sys_dict_data` (`dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES ( 0, '未整改', '10', 'question_reform_status', NULL, 'default', 'N', '0', '超级管理员', '2023-09-13 18:17:38', '', NULL, NULL);
+INSERT INTO `sys_dict_data` (`dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES ( 1, '已整改', '11', 'question_reform_status', NULL, 'default', 'N', '0', '超级管理员', '2023-09-13 18:17:47', '', NULL, NULL);

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/drill/service/impl/CoreDrillTaskServiceImpl.java

@@ -532,12 +532,14 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
         String typeText = task.getTypeText() == null ? StringUtil.EMPTY_STRING : task.getTypeText();
         String presetCase = task.getPresetCase() == null ? StringUtil.EMPTY_STRING : task.getPresetCase();
         String drillSituation = task.getDrillSituation() == null ? StringUtil.EMPTY_STRING : task.getDrillSituation();
+        String recorderName = task.getRecorderName() == null ? StringUtil.EMPTY_STRING : task.getRecorderName();
 
         data.put("orgName", StringUtils.isNotEmpty(orgName) ? orgName : StringUtil.EMPTY_STRING);
         data.put("drillSite", StringUtils.isNotEmpty(drillSite) ? drillSite : StringUtil.EMPTY_STRING);
         data.put("drillTime", StringUtils.isNotEmpty(drillTime) ? drillTime : StringUtil.EMPTY_STRING);
         data.put("hostName", StringUtils.isNotEmpty(hostName) ? hostName : StringUtil.EMPTY_STRING);
         data.put("typeText", StringUtils.isNotEmpty(typeText) ? typeText : StringUtil.EMPTY_STRING);
+        data.put("recorderName", StringUtils.isNotEmpty(recorderName) ? recorderName : StringUtil.EMPTY_STRING);
         data.put("presetCase", StringUtils.isNotEmpty(presetCase) ? "预设案由: " + presetCase : StringUtil.EMPTY_STRING);
         data.put("drillSituation", StringUtils.isNotEmpty(drillSituation) ? "演练情况: " + drillSituation : StringUtil.EMPTY_STRING);
         List<CoreDrillTaskToUser> taskUserList = task.getTaskUserList();

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/dto/rule/SafetyCheckRulePageDto.java

@@ -16,7 +16,4 @@ public class SafetyCheckRulePageDto extends PageDto<SafetyCheckRulePageVo> {
 
     @ApiModelProperty(value = "履职机构类型")
     private String orgType;
-
-    private Long orgId;
-
 }

soc-modules/soc-modules-core/src/main/resources/mapper/safetycheck/SafetyCheckRuleMapper.xml

@@ -26,6 +26,10 @@
             <if test="appRule.checkSub==false">
                 and a.org_id=#{appRule.orgId}
             </if>
+            <if test="appRule.checkSub==true">
+                and a.org_id in (select id from sys_org where `path` like concat((select `path` from sys_org where id =
+                #{appRule.orgId}),'%'))
+            </if>
         </where>
         order by a.create_time desc
     </select>

soc-modules/soc-modules-core/src/main/resources/mapper/safetycheck/SafetyCheckRulePointMapper.xml

@@ -72,7 +72,7 @@
 
     <select id="checkIsUsed" resultType="java.lang.Integer">
         SELECT 1
-        FROM core_safetycheck_data a
+        FROM core_safety_task_data a
         WHERE a.item_id = #{pointId}
         limit 1
     </select>

soc-modules/soc-modules-file/src/main/java/com/xunmei/file/utils/PdfUtil.java

@@ -220,8 +220,8 @@ public class PdfUtil {
         createPDFCell(tableFont, table, data.get("hostName").toString(), Element.ALIGN_CENTER, 2, 1);
 
         //第三行
-        createPDFCell(tableFont, table, "演练项目", Element.ALIGN_CENTER, 5, 1);
-        createPDFCell(tableFont, table, data.get("typeText").toString(), Element.ALIGN_CENTER, 2, 1);
+        createPDFCell(tableFont, table, "演练项目", Element.ALIGN_CENTER, 1, 1);
+        createPDFCell(tableFont, table, data.get("typeText").toString(), Element.ALIGN_CENTER, 5, 1);
 
         //内容
         PdfPCell contentCell = new PdfPCell();
@@ -263,6 +263,10 @@ public class PdfUtil {
         cell.addElement(imageTable);
         table.addCell(cell);
 
+        //第三行
+        createPDFCell(tableFont, table, "记录人", Element.ALIGN_CENTER, 1, 1);
+        createPDFCell(tableFont, table, data.get("recorderName").toString(), Element.ALIGN_CENTER, 5, 1);
+
     /*    //第三行
         createPDFCell(tableFont, table, "参会人员签字", Element.ALIGN_CENTER, 1, 1);
         createPDFCell(tableFont, table, data.get("users").toString(), Element.ALIGN_CENTER, 5, 1);*/

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysUserController.java

@@ -88,7 +88,7 @@ public class SysUserController extends BaseController {
 
             if (i >= 0) {
                 String[] split = s.split(",");
-                for (int l = 0; l < split.length - 1; l++) {
+                for (int l = 0; l < split.length; l++) {
                     if (split[l].endsWith("管理人员") || split[l].equals("超级管理员")) {
                         admin = true;
                         break;