内容库定义与管理入口合一

project_data/sql/0.0.3/soc/soc.sql

@@ -1174,6 +1174,29 @@ INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (122, 0172401740487231
 
 -- 删除检查登记授权按钮权限
 DELETE from sys_menu WHERE perms='core:safetycheck:grant'  and menu_type='F';
+
+-- 删除履职内容库管理页面，改为按钮
+DELETE FROM sys_menu WHERE menu_name like '履职内容库管理%';
+DELETE FROM sys_role_menu WHERE menu_id =1726808689796902913;
+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 (01726808689796902913, '履职内容库管理', 2004, 5, '', NULL, NULL, 1, 0, 'F', '0', '0', 'resumption:rule:contentmanage', '1', NULL, NULL, 'jwx', '2023-11-21 11:44:08', '', NULL, '');
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (115, 1726808689796902913);
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (116, 1726808689796902913);
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (117, 1726808689796902913);
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (118, 1726808689796902913);
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (119, 1726808689796902913);
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (120, 1726808689796902913);
+
+DELETE FROM sys_menu WHERE id =2332 or parent_id=2332 or id=01726875550324551681;
+DELETE FROM sys_role_menu WHERE menu_id =01726875550324551681;
+
+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 (01726875550324551681, '内容库管理', 2327, 5, '', NULL, NULL, 1, 0, 'F', '0', '0', 'safetycheck.rule:contentmanage', '1', NULL, NULL, 'jwx', '2023-11-21 16:09:49', '', NULL, '');
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (115, 01726875550324551681);
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (116, 01726875550324551681);
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (117, 01726875550324551681);
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (118, 01726875550324551681);
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (119, 01726875550324551681);
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (120, 01726875550324551681);
+
 DELETE from sys_role_menu WHERE menu_id not in (SELECT id from sys_menu);
 
 -- 履职任务类型修正

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/controller/AppRuleItemController.java

@@ -33,21 +33,21 @@ public class AppRuleItemController extends BaseController {
 
     @ApiOperation(value = "新增/编辑")
     @PostMapping("edit")
-    @RequiresPermissions(value={"resumption:ruleManager:edit","resumption:ruleManager:add"})
+    @RequiresPermissions(value={"resumption:rule:contentmanage"})
     public AjaxResult edit(@RequestBody AppRuleItemDto appRuleItemDto) {
         return success(appRuleItemService.edit(appRuleItemDto));
     }
 
     @ApiOperation(value = "分页查询")
     @GetMapping("page")
-    @RequiresPermissions("resumption:ruleManager:query")
+    @RequiresPermissions("resumption:rule:contentmanage")
     public TableDataInfo page(AppRuleItemPageDto itemPageDto) {
         return appRuleItemService.pageQuery(itemPageDto);
     }
 
     @ApiOperation(value = "删除")
     @DeleteMapping("{id}")
-    @RequiresPermissions("resumption:ruleManager:remove")
+    @RequiresPermissions("resumption:rule:contentmanage")
     public AjaxResult del(@PathVariable("id") Long id) {
         return success(appRuleItemService.del(id));
     }
@@ -60,7 +60,7 @@ public class AppRuleItemController extends BaseController {
 
     @ApiOperation(value = "机构+内容库树")
     @GetMapping("/rule/tree")
-    @RequiresPermissions("resumption:ruleManager:query")
+    @RequiresPermissions("resumption:rule:contentmanage")
     public AjaxResult getRuleTree() {
         return success(appRuleItemService.getRuleTree(SecurityUtils.getLoginUser().getSysUser().getOrgId()));
     }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/controller/SafetyCheckRuleItemController.java

@@ -1,6 +1,7 @@
 package com.xunmei.core.safetyCheck.controller;
 
 
+import cn.hutool.core.date.DateUtil;
 import com.xunmei.common.core.web.controller.BaseController;
 import com.xunmei.common.core.web.domain.AjaxResult;
 import com.xunmei.common.core.web.page.TableDataInfo;
@@ -36,35 +37,35 @@ public class SafetyCheckRuleItemController extends BaseController {
 
     @ApiOperation(value = "新增/编辑")
     @PostMapping("edit")
-    @RequiresPermissions(value={"safetycheck:ruleManager:edit","safetycheck:ruleManager:add"})
+    @RequiresPermissions(value={"safetycheck:rule:contentmanage"})
     public AjaxResult edit(@RequestBody SafetyCheckRuleItemDto appRuleItemDto) {
         return success(safetyCheckRuleItemService.edit(appRuleItemDto));
     }
 
     @ApiOperation(value = "分页查询")
     @GetMapping("page")
-    @RequiresPermissions("safetycheck:ruleManager")
+    @RequiresPermissions("safetycheck:rule:contentmanage")
     public TableDataInfo page(SafetyCheckRuleItemPageDto itemPageDto) {
         return safetyCheckRuleItemService.pageQuery(itemPageDto);
     }
 
     @ApiOperation(value = "删除")
     @DeleteMapping("{id}")
-    @RequiresPermissions("safetycheck:ruleManager:remove")
+    @RequiresPermissions("safetycheck:rule:contentmanage")
     public AjaxResult del(@PathVariable("id") Long id) {
         return success(safetyCheckRuleItemService.del(id));
     }
 
     @ApiOperation(value = "详情")
     @GetMapping("{id}")
-    @RequiresPermissions("safetycheck:ruleManager:query")
+    @RequiresPermissions("safetycheck:rule:contentmanage")
     public AjaxResult findOne(@PathVariable("id") Long id) {
         return success(safetyCheckRuleItemService.findOne(id));
     }
 
     @ApiOperation(value = "机构树")
     @GetMapping("/rule/tree")
-    @RequiresPermissions("safetycheck:ruleManager")
+    @RequiresPermissions("safetycheck:rule:contentmanage")
     public AjaxResult getRuleTree() {
         return success(safetyCheckRuleItemService.getRuleTree(SecurityUtils.getLoginUser().getSysUser().getOrgId()));
     }