From 1b02862f56fc90459088a7850b1cbc66686ea29e Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 30 十月 2026 16:45:12 +0800
Subject: [PATCH] feat(order): 新增委托单级联删除服务 - 新增 InsOrderDeletionService，实现委托单及全部关联业务记录的级联删除 - 重构删除接口，增加权限校验和操作日志注解 - 委托单、报告、样品、样品接收、用章台账、过程报告等模块统一增加送样日期字段并按送样日期排序 - 委托单新增时校验送样日期不能为空 - 优化角色菜单权限，新增
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java
index 9d9fab6..0b1030f 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java
@@ -68,12 +68,14 @@
/**
* 鍔犺浇瀵瑰簲瑙掕壊鑿滃崟鍒楄〃鏍�
*/
- @GetMapping(value = "/roleMenuTreeselect/{roleId}")
- public AjaxResult roleMenuTreeselect(@PathVariable("roleId") Long roleId)
+ @PreAuthorize("@ss.hasAnyPermi('system:role:add,system:role:edit')")
+ @GetMapping(value = {"/roleMenuTreeselect", "/roleMenuTreeselect/{roleId}"})
+ public AjaxResult roleMenuTreeselect(@PathVariable(value = "roleId", required = false) Long roleId)
{
- List<SysMenu> menus = menuService.selectMenuList(getUserId());
+ List<SysMenu> menus = menuService.selectRoleMenuList(getUserId());
AjaxResult ajax = AjaxResult.success();
- ajax.put("checkedKeys", menuService.selectMenuListByRoleId(roleId));
+ ajax.put("checkedKeys", roleId == null ? java.util.Collections.emptyList()
+ : menuService.selectMenuListByRoleId(roleId));
ajax.put("menus", menuService.buildMenuTreeSelect(menus));
return ajax;
}
@@ -162,4 +164,4 @@
}
return toAjax(menuService.deleteMenuById(menuId));
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3