From 8444084e6aa11efa23287e7f82474ac22378a5c4 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 01 四月 2025 16:03:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysMenuController.java | 32 +++++++++++++++++++++++++++-----
1 files changed, 27 insertions(+), 5 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysMenuController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysMenuController.java
index 85a7bd0..9ea25c4 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysMenuController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysMenuController.java
@@ -1,5 +1,6 @@
package com.ruoyi.system.controller.sys;
+import com.alibaba.fastjson.JSON;
import com.ruoyi.common.core.constant.UserConstants;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.web.controller.BaseController;
@@ -8,13 +9,16 @@
import com.ruoyi.common.log.enums.BusinessType;
import com.ruoyi.common.security.annotation.RequiresPermissions;
import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.system.api.domain.poji.sys.SysUser;
import com.ruoyi.system.domain.pojo.sys.SysMenu;
import com.ruoyi.system.service.sys.ISysMenuService;
+import com.ruoyi.system.service.sys.ISysUserService;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
import java.util.List;
/**
@@ -28,6 +32,9 @@
{
@Autowired
private ISysMenuService menuService;
+
+ @Autowired
+ private ISysUserService sysUserService;
/**
* 获取菜单列表
@@ -79,7 +86,7 @@
@ApiOperation(value = "加载对应部门菜单列表树")
- @GetMapping(value = "/roleMenuTreeselect/{deptId}")
+ @GetMapping(value = "/deptMenuTreeselect/{deptId}")
public AjaxResult deptMenuTreeselect(@PathVariable("deptId") Long deptId)
{
Long userId = SecurityUtils.getUserId();
@@ -96,10 +103,12 @@
public AjaxResult deptUserMenuTreeselect(@PathVariable("deptUserId") Long deptUserId)
{
Long userId = SecurityUtils.getUserId();
- List<SysMenu> menus = menuService.selectMenuList(userId);
+ SysUser sysUser = sysUserService.selectUserById(deptUserId);
+ List<SysMenu> menus = menuService.selectDeptMenuList(deptUserId);
AjaxResult ajax = AjaxResult.success();
ajax.put("checkedKeys", menuService.selectMenuListByDeptUserId(deptUserId));
ajax.put("menus", menuService.buildMenuTreeSelect(menus));
+ ajax.put("dataScope", sysUser.getDataScope());
return ajax;
}
@@ -107,7 +116,7 @@
* 新增菜单
*/
@RequiresPermissions("system:menu:add")
- @Log(title = "菜单管理", businessType = BusinessType.INSERT)
+ @Log(title = "菜单管理", businessType = BusinessType.INSERT,operContent = "新增菜单")
@PostMapping
public AjaxResult add(@Validated @RequestBody SysMenu menu)
{
@@ -127,7 +136,7 @@
* 修改菜单
*/
@RequiresPermissions("system:menu:edit")
- @Log(title = "菜单管理", businessType = BusinessType.UPDATE)
+ @Log(title = "菜单管理", businessType = BusinessType.UPDATE,operContent = "修改菜单")
@PutMapping
public AjaxResult edit(@Validated @RequestBody SysMenu menu)
{
@@ -151,7 +160,7 @@
* 删除菜单
*/
@RequiresPermissions("system:menu:remove")
- @Log(title = "菜单管理", businessType = BusinessType.DELETE)
+ @Log(title = "菜单管理", businessType = BusinessType.DELETE,operContent = "删除菜单")
@DeleteMapping("/{menuId}")
public AjaxResult remove(@PathVariable("menuId") Long menuId)
{
@@ -178,4 +187,17 @@
List<SysMenu> menus = menuService.selectMenuTreeByUserId(userId);
return success(menuService.buildMenus(menus));
}
+
+ /**
+ * 获取路由信息
+ *
+ * @return 路由信息
+ */
+ @GetMapping("getStaffRouters")
+ public AjaxResult getStaffRouters()
+ {
+ Long userId = SecurityUtils.getUserId();
+ List<SysMenu> menus = menuService.selectStaffMenuTreeByUserId(userId);
+ return success(menuService.buildMenus(menus));
+ }
}
\ No newline at end of file
--
Gitblit v1.7.1