预案范本管理增加菜单及菜单权限

project_data/sql/0.0.5/soc/soc.sql

@@ -146,4 +146,7 @@ INSERT INTO `sys_dict_data` ( `dict_sort`, `dict_label`, `dict_value`, `dict_typ
 DELETE from sys_dict_data where dict_type='sign_level' and dict_label='其他' limit 1;
 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, '其他', '3', 'sign_level', NULL, 'default', 'N', '0', null, NOW(), null
                                                                                                                                                                                                                 , NOW(), NULL);
-
+-- 增加演练范本详情菜单权限
+set @id =  ( SELECT id FROM `sys_menu` where menu_name='演练范本详情' and perms='core:drillDictionary:query');
+DELETE from sys_role_menu where menu_id=@id;
+insert into sys_role_menu select DISTINCT id,@id from sys_role;

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/drill/controller/CoreDrillDictionaryController.java

@@ -47,7 +47,7 @@ public class CoreDrillDictionaryController extends BaseController {
      * 获取预案演练库详细信息
      */
     @ApiOperation(value = "获取CoreDrillDictionary详细信息")
-    @RequiresPermissions("core:drillDictionary:edit")
+    @RequiresPermissions("core:drillDictionary:query")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         return success(coreDrillDictionaryService.selectCoreDrillDictionaryById(id));

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/panel/service/impl/PanelServiceImpl.java

@@ -99,14 +99,16 @@ public class PanelServiceImpl implements PanelService {
 
     @Override
     public List<PanelResultVo> selectPage() throws ExecutionException, InterruptedException, TimeoutException {
-        Long userId=SecurityUtils.getUserId();
+        Long userId = SecurityUtils.getUserId();
         List<Long> roles = RemoteCallHandlerExecutor.executeRemoteCall(
                 () -> roleService.getUserRoleId(userId, SecurityConstants.FROM_SOURCE),
                 ErrorMsgConstants.QUERY_USER_ROLE_ERROR);
 
         PanelListDto panelListDto = PanelAdapter.getMapperSelectParam(SecurityUtils.getLoginUser().getOrgId(),
                 roles, userId);
-
+        if (ObjectUtil.isEmpty(panelListDto.getRoleIdList())) {
+            return new ArrayList<>();
+        }
 
         //履职任务
         CompletableFuture<List<PanelListVo>> resumptionTaskFuture = CompletableFuture.supplyAsync(() ->
@@ -203,6 +205,9 @@ public class PanelServiceImpl implements PanelService {
         PanelListDto req = PanelAdapter.getMapperSelectParam(SecurityUtils.getLoginUser().getOrgId(),
                 roles, SecurityUtils.getUserId());
         req.setPermList(permList);
+        if (ObjectUtil.isEmpty(req.getRoleIdList()) || ObjectUtil.isEmpty(permList)) {
+            return new ArrayList<>();
+        }
         List<CompletableFuture<WebPanelResult>> list = new ArrayList<>();
         //教育培训
         CompletableFuture<WebPanelResult> eduTrainingTaskFuture = CompletableFuture.supplyAsync(() ->