Merge remote-tracking branch 'origin/V0.0.2' into V0.0.2

project_data/sql/0.0.2/soc/soc.sql

@@ -207,6 +207,7 @@ 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, '已发布', '1', 'message_status', NULL, 'default', 'N', '0', '超级管理员', '2023-09-13 17:09:19', '', NULL, NULL);
 
 delete from sys_menu where menu_name in('公告通知','公告通知详情','公告通知编辑','新增公告通知','删除公告通知','发布公告通知','取消发布');
+delete from sys_menu where menu_name in(2208,2209,2210,2211,2212,2213,2196);
 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, '公告通知', 2207, 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, '');
@@ -1253,3 +1254,37 @@ 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 ( 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);
+
+
+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 (00000000000000002325, '安全检查登记', 2136, 4, '/securityCheckRegister', NULL, NULL, 1, 0, 'C', '0', '0', 'core:safetycheck:appregister', '0', 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFYAAABWCAMAAABiiJHFAAAAM1BMVEVHcEzYvXHYvXHYvXHYvXHYvXHYvXHYvXHYvXHYvXHYvXHYvXHYvXHYvXHYvXHYvXHYvXF4gE2CAAAAEHRSTlMAV5zcH/72wO9wPIf7z+evrVcrhwAAAAlwSFlzAAALEgAACxIB0t1+/AAAAuBJREFUWIXtmddu7CAQhode3Ob9nzYyNjaYYpZFOidS/qtkhb/FUxkW/tSmSVE73FRkRkRcRmMdFXEaSzWIzBqB61jshAgAC+qx2BVRgZ0RySgiWTGWWPj3VCswEetDKe1FYUmpiBz8Akabqex+XoHOYQ3cf8tGkxgMsSyH5Tz4pzE6QhfJ6Eu85j3gbrVFR+Qjm9muILFptiZshJAciIq1WaDRGvU5FmWmbG34NRZRrtFmF/2M5D7sq/6w/wW2bekna381li+VNt6PlbXK14O1xrqaTgG4eYp0YxXOfHOdi8s0rGgvdkOcj6aicuHai3XtUexvS0rtt89l9HxXmFQi3o8dufZXY4mqHFy6sXx4ljlpd7S3SZaZbizVjLPjqDAybpXLsnl0llnts2zLUEUvFoCKY7bhq07UXWr2Db9MeH9Z9g3WVkfHLiyZ9twV5NF0VG5tO1Yh0tUV8kc63Gvloqhpuw+4sNOVpNEEciTCx7pfzAg/dkVNp2/uDexF5FxnWPd9m/kMC/UJkV6eFOzVwK3enebI4uxlSE2weTskY6Co2+uBpSLXdHLHJ1Gd1mMsyWdZdsKu7vfCGjUBFyhsFGDOhLm6jkcnecXuWSbdJVWYDrJwJeLUcsI2IviCWwUTaHdhUI6z27b7VZ3zV+ig/RCdoTJ3EKxsN3AZP035UMay8nyyXC8CbEHPK6zTV+4lisHwjk0cdkSWe4niVcg7NtmsKzW0/uArlngveWPQ4NPi1dsr1lwwepP8Ma14vDx8kB5jTvn4cr7fQ3ANqeUIywRlKL/CYYFr1z74VSSLr1lKzFN2n1eDffE4XYr30dnihOFz5wrtUyVMwmL2FuvIZTxfeYRJNiJLVICpypX3BfxpyfD1apWcb+nQeOuK/MMQPKTOFWqDbmOKqFF++QMCway+/v2A5qitF8+fcQdQfUsKI28EdW8dIVi3nMMawdt5mT2zcdBD+zQ8GPkvBAA/0zOEJ7oqo7UAAAAASUVORK5CYII=', NULL, '超级管理员', '2023-09-21 11:27:50', '超级管理员', '2023-09-22 16:44:12', '');
+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 (00000000000000002326, '安全检查', 0, 7, 'safetycheck', NULL, NULL, 1, 0, 'M', '0', '0', '', '1', 'nested', NULL, '超级管理员', '2023-09-21 15:33:41', 'jwx', '2023-09-23 11:09:29', '');
+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 (00000000000000002327, '安全检查内容库定义', 2326, 1, 'rule', 'safetycheck/rule/index', NULL, 1, 0, 'C', '0', '0', 'safetycheck:rule', '1', 'excel', NULL, '超级管理员', '2023-09-21 15:35:12', 'jwx', '2023-09-23 12:23:07', '');
+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 (00000000000000002328, '安全检查内容库定义查询', 2327, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'safetycheck:rule:query', '1', NULL, NULL, '超级管理员', '2023-09-21 15:35:48', '', 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 (00000000000000002329, '安全检查内容库定义新增', 2327, 2, 'safetycheck:rule:add', NULL, NULL, 1, 0, 'F', '0', '0', 'safetycheck:rule:add', '1', NULL, NULL, '超级管理员', '2023-09-21 15:36:30', 'jwx', '2023-09-21 15:46:48', '');
+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 (00000000000000002330, '安全检查内容库定义编辑', 2327, 3, 'safetycheck:rule:edit', NULL, NULL, 1, 0, 'F', '0', '0', 'safetycheck:rule:edit', '1', NULL, NULL, '超级管理员', '2023-09-21 15:36:58', 'jwx', '2023-09-21 15:46:55', '');
+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 (00000000000000002331, '安全检查内容库定义删除', 2327, 4, 'safetycheck:rule:remove', NULL, NULL, 1, 0, 'F', '0', '0', 'safetycheck:rule:remove', '1', NULL, NULL, '超级管理员', '2023-09-21 15:37:21', 'jwx', '2023-09-21 15:47:02', '');
+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 (00000000000000002332, '安全检查内容库管理', 2326, 2, 'rulemanager', 'safetycheck/ruleManager/index', NULL, 1, 0, 'C', '0', '0', 'safetycheck:ruleManager', '1', 'edit', NULL, '超级管理员', '2023-09-21 15:38:40', 'jwx', '2023-09-23 12:21:30', '');
+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 (00000000000000002333, '安全检查内容库管理查询', 2332, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'safetycheck:ruleManager:query', '1', NULL, NULL, '超级管理员', '2023-09-21 15:40:17', '', 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 (00000000000000002334, '安全检查内容库管理新增', 2332, 2, '', NULL, NULL, 1, 0, 'F', '0', '0', 'safetycheck:ruleManager:add', '1', NULL, NULL, '超级管理员', '2023-09-21 15:41:47', '', 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 (00000000000000002335, '安全检查内容库管理编辑', 2332, 3, '', NULL, NULL, 1, 0, 'F', '0', '0', 'safetycheck:ruleManager:edit', '1', NULL, NULL, '超级管理员', '2023-09-21 15:42:13', '', 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 (00000000000000002336, '安全检查内容库管理删除', 2332, 4, '', NULL, NULL, 1, 0, 'F', '0', '0', 'safetycheck:ruleManager:remove', '1', NULL, NULL, '超级管理员', '2023-09-21 15:43:04', '', 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 (00000000000000002338, '演练计划详情', 2321, 6, '', NULL, NULL, 1, 0, 'F', '0', '0', 'core:drillPlan:query', '1', NULL, NULL, '超级管理员', '2023-09-22 10:21:32', '', 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 (00000000000000002339, '列表', 2317, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'core:checkplan:list', '1', NULL, NULL, '超级管理员', '2023-09-22 10:22:19', '', 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 (00000000000000002340, '获取详情', 2317, 2, '', NULL, NULL, 1, 0, 'F', '0', '0', 'core:checkplan:query', '1', NULL, NULL, '超级管理员', '2023-09-22 10:23: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 (00000000000000002341, '新增', 2317, 4, '', NULL, NULL, 1, 0, 'F', '0', '0', 'core:checkplan:add', '1', NULL, NULL, '超级管理员', '2023-09-22 10:23:24', '', 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 (00000000000000002342, '修改', 2317, 3, '', NULL, NULL, 1, 0, 'F', '0', '0', 'core:checkplan:edit', '1', NULL, NULL, '超级管理员', '2023-09-22 10:23:46', '', 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 (00000000000000002344, '列表', 2318, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'core:task:list', '1', NULL, NULL, '超级管理员', '2023-09-22 11:20:36', '', 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 (00000000000000002345, '详细信息', 2318, 2, '', NULL, NULL, 1, 0, 'F', '0', '0', 'core:task:query', '1', NULL, NULL, '超级管理员', '2023-09-22 11:20:54', '', 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 (00000000000000002346, '新增', 2318, 3, '', NULL, NULL, 1, 0, 'F', '0', '0', 'core:task:add', '1', NULL, NULL, '超级管理员', '2023-09-22 11:21:12', '', 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 (00000000000000002347, '修改', 2318, 4, '', NULL, NULL, 1, 0, 'F', '0', '0', 'core:task:edit', '1', NULL, NULL, '超级管理员', '2023-09-22 11:21:32', '', 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 (00000000000000002348, '登记', 2318, 5, '', NULL, NULL, 1, 0, 'F', '0', '0', 'core:safetycheck:register', '1', NULL, NULL, '超级管理员', '2023-09-22 16:40:45', '超级管理员', '2023-09-22 16:41:19', '');
+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 (00000000000000002349, '授权', 2318, 6, '', NULL, NULL, 1, 0, 'F', '0', '0', 'core:safetycheck:grant', '1', NULL, NULL, '超级管理员', '2023-09-22 16:41:49', '', 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 (00000000000000002350, '问题处理管理', 0, 10, 'question', NULL, NULL, 1, 0, 'M', '0', '0', NULL, '1', 'bug', NULL, '超级管理员', '2023-09-23 16:27:13', '', 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 (00000000000000002351, '隐患问题清单', 2350, 1, 'list', 'question/list/index', NULL, 1, 0, 'C', '0', '0', 'question:list', '1', 'list', NULL, '超级管理员', '2023-09-23 16:28:54', '', 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 (00000000000000002352, '查询', 2351, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'question:list:query', '1', NULL, NULL, '超级管理员', '2023-09-23 16:29:14', '', 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 (00000000000000002353, '隐患确认', 2351, 2, '', NULL, NULL, 1, 0, 'F', '0', '0', 'question:list:confirm', '1', NULL, NULL, '超级管理员', '2023-09-23 16:29:38', '', 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 (00000000000000002354, '异议审批', 2351, 3, '', NULL, NULL, 1, 0, 'F', '0', '0', 'question:list:confirmDissent', '1', NULL, NULL, '超级管理员', '2023-09-23 16:29: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 (00000000000000002355, '整改', 2351, 4, '', NULL, NULL, 1, 0, 'F', '0', '0', 'question:list:reform', '1', NULL, NULL, '超级管理员', '2023-09-23 16:30:16', '', 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 (00000000000000002356, '消息中心', 2065, 3, '/message', NULL, NULL, 1, 0, 'M', '0', '0', NULL, '0', 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFYAAABWCAMAAABiiJHFAAAAMFBMVEVHcExsnHRsnHRsnHRsnHRsnHRsnHRsnHRsnHRsnHRsnHRsnHRsnHRsnHRsnHRsnHQnA1lLAAAAD3RSTlMAQIDA0PAQMKDgcGAgUJBBLOu8AAAACXBIWXMAAAsSAAALEgHS3X78AAABJ0lEQVRYhe3Y2Y6DMAwF0Js9gbT5/7+tspg+jMqwxA+d8X2yUDgCAwIDieTbow7n1ImWwxFWWGGFFfY265469SJqW0aVBhftRdZ6AJGKpW5aADwa6oHcYJifZ6D32FwL70oJbZOh5bqU1IpwhbUY2ihW8v22n73D9kOrXehsvsV2pDZBfWiCutRbmwFfD8gFwEe6ZCtdsuAusaUY43phqUiG7jQzuAvskQgrrLDC/hO2TmXLtszuDGmn2JbNNXurTrPtI+HNqsON+YUldzYLy8O2N+98trvz2fY1wMBWl4OF4mGx8rAIPCw1Q9gvY7P+nDf51Fqf++e2k01dZ4ktpMapKnhUGmEmq51ts/F0Nk1XMYbC+SyHilIeDComPwYUHlUi+UsB8AJnTJyCMJLPUQAAAABJRU5ErkJggg==', NULL, '超级管理员', '2023-09-25 08:43:50', '', 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 (00000000000000002357, '删除', 2317, 5, '', NULL, NULL, 1, 0, 'F', '0', '0', 'core:checkplan:remove', '1', NULL, NULL, '超级管理员', '2023-09-25 11:35:35', '', 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 (01706239529069875201, '业务提醒', 2356, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'core:center:list', '0', NULL, NULL, '超级管理员', '2023-09-25 17:30:01', '', NULL, '');

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/Eto/SysOrgTreeRequestDto.java

@@ -6,10 +6,19 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.util.List;
+
 @Data
 public class SysOrgTreeRequestDto {
 
     private Long orgId;
 
     private Boolean includeSub=false;
+
+    // 排查指定机构名称
+    private String excludeOrgName;
+
+    // 排查指定机构编码
+    private String excludeOrgCode;
+
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/information/controller/CoreMessageCenterController.java

@@ -34,7 +34,7 @@ public class CoreMessageCenterController extends BaseController {
  */
 
 @ApiOperation(value = "查询消息列表")
-@RequiresPermissions("system:center:list")
+@RequiresPermissions("core:center:list")
 @GetMapping("/messageList")
 public TableDataInfo<CoreMessageCenterVO> list(CoreMessageCenterDTO coreMessageCenter) {
     if (null==coreMessageCenter.getType()){
@@ -47,7 +47,7 @@ public TableDataInfo<CoreMessageCenterVO> list(CoreMessageCenterDTO coreMessageC
      * 获取消息中心详细信息
      */
     @ApiOperation(value = "获取CoreMessageCenter详细信息")
-    @RequiresPermissions("system:center:query")
+    @RequiresPermissions("core:center:query")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         return success(coreMessageCenterService.selectCoreMessageCenterById(id));
@@ -57,7 +57,7 @@ public TableDataInfo<CoreMessageCenterVO> list(CoreMessageCenterDTO coreMessageC
      * 新增消息中心
      */
     @ApiOperation(value = "新增CoreMessageCenter")
-    @RequiresPermissions("system:center:add")
+    @RequiresPermissions("core:center:add")
     @Log(title = "消息中心" , businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody CoreMessageCenter coreMessageCenter) {
@@ -68,7 +68,7 @@ public TableDataInfo<CoreMessageCenterVO> list(CoreMessageCenterDTO coreMessageC
      * 修改消息中心
      */
     @ApiOperation(value = "修改CoreMessageCenter")
-    @RequiresPermissions("system:center:edit")
+    @RequiresPermissions("core:center:edit")
     @Log(title = "消息中心" , businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody CoreMessageCenter coreMessageCenter) {
@@ -79,7 +79,7 @@ public TableDataInfo<CoreMessageCenterVO> list(CoreMessageCenterDTO coreMessageC
      * 删除消息中心
      */
     @ApiOperation(value = "删除CoreMessageCenter")
-    @RequiresPermissions("system:center:remove")
+    @RequiresPermissions("core:center:remove")
     @Log(title = "消息中心" , businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids) {

soc-modules/soc-modules-sync/src/main/java/com/xunmei/sync/config/ThirdPartySystemConfig.java

@@ -32,6 +32,11 @@ public class ThirdPartySystemConfig {
     private String fjnxSyncOrgCustomRootOrgCode;
 
     /**
+     * 同步机构时原因省联社机构更改的新名称
+     */
+    private String fjnxSyncOrgOriginalRootOrgNewName;
+
+    /**
      * 同步用户默认密码
      */
     private String fjnxSyncUserDefaultPassword;

soc-modules/soc-modules-sync/src/main/java/com/xunmei/sync/service/impl/FJNXSyncServiceImpl.java

@@ -1038,9 +1038,10 @@ public class FJNXSyncServiceImpl implements IFJNXSyncService {
                 log.error("没有机构编码，机构名称:{}", item.getOrgName());
                 return;
             }
-            if(ObjectUtil.equal(item.getShortName(),"省联社"))
+            if(ObjectUtil.equal(item.getShortName(),"省联社") && !StringUtil.isNullOrEmpty(thirdPartySystemConfig.getFjnxSyncOrgOriginalRootOrgNewName()) )
             {
-                item.setShortName("省联社职能部门");
+                item.setOrgName(thirdPartySystemConfig.getFjnxSyncOrgOriginalRootOrgNewName());
+                item.setShortName(thirdPartySystemConfig.getFjnxSyncOrgOriginalRootOrgNewName());
             }
 
             FjnxOrg tempOrg = new FjnxOrg();
@@ -1049,10 +1050,10 @@ public class FJNXSyncServiceImpl implements IFJNXSyncService {
             tempOrg.setLastSyncTime(syncDateTime);
             tempOrg.setBusinessParentCode(tempOrg.getOrgParent());
             tempOrg.setTreeShowParentCode(tempOrg.getOrgParent());
-            if(item.getOrgCode().equals("M33000000"))
-            {
-                String a="M33000000";
-            }
+//            if(item.getOrgCode().equals("M33000000"))
+//            {
+//                String a="M33000000";
+//            }
 
             Optional<FjnxOrgBusinessRelation> first = fjnxOrgBusinessRelationList.stream().filter(b -> b.getOrgCode().equals(item.getOrgCode())).findFirst();
             if (first.isPresent()) {

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

@@ -157,12 +157,17 @@ public class SysDeptController extends BaseController {
     }
 
     @PostMapping("/deptTree/business")
-    public AjaxResult businessDeptTree(@RequestBody String excludeOrgCode) {
-        if(StringUtils.isEmpty(excludeOrgCode))
-        {
-            excludeOrgCode="900000000";
-        }
-        return success(deptService.selectBusinessTreeList(excludeOrgCode));
+    public AjaxResult businessDeptTree(@RequestBody SysOrgTreeRequestDto request) {
+//        if(ObjectUtil.isEmpty(request) )
+//        {
+//            request=new SysOrgTreeRequestDto();
+//        }
+//        if(StringUtils.isEmpty(request.getExcludeOrgCode()))
+//        {
+//            // 默认排查省联社
+//            request.setExcludeOrgCode("900000000");
+//        }
+        return success(deptService.selectBusinessTreeList(request));
     }
 
     /**

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/ISysDeptService.java

@@ -38,7 +38,7 @@ public interface ISysDeptService extends IService<SysDept> {
      */
     List<SysOrgVO> selectHangsheTreeList();
 
-    List<SysOrgVO> selectBusinessTreeList(String excludeOrgCode);
+    List<SysOrgVO> selectBusinessTreeList(SysOrgTreeRequestDto request);
 
     /**
      * 获取缓存的行社及行社上级机构

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysDeptServiceImpl.java

@@ -149,14 +149,14 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
     }
 
     @Override
-    public List<SysOrgVO> selectBusinessTreeList(String excludeOrgCode) {
+    public List<SysOrgVO> selectBusinessTreeList(SysOrgTreeRequestDto request) {
         SysOrg sysOrg = null;
         SysOrgVO excludeOrg = null;
         sysOrg = getLoginUserOrg();
         List<SysOrgVO> cacheList = getOrgCache();
         List<SysOrgVO> orgs = new ArrayList<>();
-        if(StringUtils.isNotEmpty(excludeOrgCode)){
-            final Optional<SysOrgVO> first = cacheList.stream().filter(x -> ObjectUtil.equal(x.getCode(), excludeOrgCode)).findFirst();
+        if(StringUtils.isNotEmpty(request.getExcludeOrgCode())){
+            final Optional<SysOrgVO> first = cacheList.stream().filter(x -> ObjectUtil.equal(x.getCode(), request.getExcludeOrgCode())).findFirst();
             if(first.isPresent())
             {
                 excludeOrg=first.get();
@@ -181,10 +181,40 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
             }
             orgs.add(org);
         }
+        if(!StringUtils.isEmpty(request.getExcludeOrgName()))
+        {
+            orgs= excludeOrgByOrgName(orgs,request.getExcludeOrgName());
+        }
+
         return generateTree(orgs, sysOrg);
     }
 
     /**
+     * 排除指定机构名称的机构以及该机构的下级机构
+     * @param orgs 待排出机构列表
+     * @param excludeOrgName 需排出机构的名称
+     * @return
+     */
+    private List<SysOrgVO> excludeOrgByOrgName(List<SysOrgVO> orgs,String excludeOrgName)
+    {
+        List<SysOrgVO> result = new ArrayList<>();
+
+        final List<SysOrgVO> excludeOrgList = orgs.stream().filter(x -> ObjectUtil.equal(x.getName(), excludeOrgName)).collect(Collectors.toList());
+        if(ObjectUtil.isEmpty(excludeOrgList))
+        {
+            return orgs;
+        }
+        for (SysOrgVO org : orgs) {
+            if(excludeOrgList.stream().anyMatch(e-> org.getPath().startsWith(e.getPath())))
+            {
+                continue;
+            }
+            result.add(org);
+        }
+        return result;
+    }
+
+    /**
      * 获取缓存的行社及行社上级机构
      *
      * @param path
@@ -265,7 +295,7 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
             return new ArrayList<>();
         }
 
-        final List<SysOrgVO> orgList = getWholePathTreeOrgFromCache(sysOrg, cacheList,request.getIncludeSub());
+        final List<SysOrgVO> orgList = getWholePathTreeOrgFromCache(sysOrg, cacheList,request.getIncludeSub(),request.getExcludeOrgName());
 
         return generateTree(orgList,null);
     }
@@ -276,7 +306,7 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
      * @param cacheList
      * @return
      */
-    public List<SysOrgVO> getWholePathTreeOrgFromCache(SysOrgVO orgVO,List<SysOrgVO> cacheList,Boolean includeSub) {
+    public List<SysOrgVO> getWholePathTreeOrgFromCache(SysOrgVO orgVO,List<SysOrgVO> cacheList,Boolean includeSub,String excludeOrgName) {
         List<SysOrgVO> selfAndAllChildOrglist =null;
         if(includeSub)
         {
@@ -286,6 +316,8 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
             selfAndAllChildOrglist=cacheList.stream().filter(c ->ObjectUtil.equal(orgVO.getId(),c.getId())).collect(Collectors.toList());
         }
 
+
+
         Set<Long> parentIds = new HashSet<>();
             Arrays.stream(orgVO.getPath().split("-")).map(p -> Long.parseLong(p))
                     .collect(Collectors.toList())
@@ -298,6 +330,13 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
                 .filter(o -> parentIds.contains(o.getId()))
                 .collect(Collectors.toList()));
 
+        // 排除指定机构名称的机构以及该机构的下级机构
+        if(StringUtils.isNotEmpty(excludeOrgName))
+        {
+            selfAndAllChildOrglist= excludeOrgByOrgName(selfAndAllChildOrglist,excludeOrgName);
+        }
+
+
         return selfAndAllChildOrglist;
     }