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/StaffMenuController.java | 28 +++++++++++++++++++++++++---
1 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/StaffMenuController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/StaffMenuController.java
index c8d2bc5..dfa1540 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/StaffMenuController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/StaffMenuController.java
@@ -2,8 +2,10 @@
import com.ruoyi.common.core.web.domain.AjaxResult;
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.web.bind.annotation.GetMapping;
@@ -12,6 +14,8 @@
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
+
+import static com.ruoyi.common.core.web.domain.AjaxResult.success;
/**
* @ClassName StaffMenuController
@@ -28,13 +32,19 @@
@Autowired
private ISysMenuService menuService;
+ @Autowired
+ private ISysUserService sysUserService;
+
+
+
+
@ApiOperation(value = "加载对应部门员工菜单列表树")
@GetMapping(value = "/roleStaffMenuTreeselect/{deptId}")
public AjaxResult deptStaffMenuTreeselect(@PathVariable("deptId") Long deptId)
{
Long userId = SecurityUtils.getUserId();
List<SysMenu> menus = menuService.selectStaffMenuList(userId);
- AjaxResult ajax = AjaxResult.success();
+ AjaxResult ajax = success();
ajax.put("checkedKeys", menuService.selectStaffMenuListByDeptId(deptId));
ajax.put("menus", menuService.buildMenuTreeSelect(menus));
return ajax;
@@ -46,11 +56,23 @@
public AjaxResult deptUserStaffMenuTreeselect(@PathVariable("deptUserId") Long deptUserId)
{
Long userId = SecurityUtils.getUserId();
- List<SysMenu> menus = menuService.selectStaffMenuList(userId);
- AjaxResult ajax = AjaxResult.success();
+ SysUser sysUser = sysUserService.selectUserById(deptUserId);
+ List<SysMenu> menus = menuService.selectStaffDeptMenuList(deptUserId);
+ AjaxResult ajax = success();
ajax.put("checkedKeys", menuService.selectStaffMenuListByDeptUserId(deptUserId));
ajax.put("menus", menuService.buildMenuTreeSelect(menus));
+ ajax.put("dataScopeEmployee", sysUser.getDataScopeEmployee());
return ajax;
}
+ /**
+ * 获取菜单下拉树列表
+ */
+ @GetMapping("/treedeptselect")
+ public AjaxResult treedeptselect(SysMenu menu)
+ {
+ Long userId = SecurityUtils.getUserId();
+ List<SysMenu> menus = menuService.selectStaffMenuList(menu, userId);
+ return success(menuService.buildMenuTreeSelect(menus));
+ }
}
--
Gitblit v1.7.1