From ed7cde0f64b01e95e11d6f66d1f27b05cea84332 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期日, 09 七月 2023 18:13:00 +0800
Subject: [PATCH] 管理台bug和用户端
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/StaffMenuController.java | 18 +++++++++++++++---
1 files changed, 15 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..1604de4 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
@@ -13,6 +13,8 @@
import java.util.List;
+import static com.ruoyi.common.core.web.domain.AjaxResult.success;
+
/**
* @ClassName StaffMenuController
* @Description TODO
@@ -34,7 +36,7 @@
{
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 +48,21 @@
public AjaxResult deptUserStaffMenuTreeselect(@PathVariable("deptUserId") Long deptUserId)
{
Long userId = SecurityUtils.getUserId();
- List<SysMenu> menus = menuService.selectStaffMenuList(userId);
- AjaxResult ajax = AjaxResult.success();
+ List<SysMenu> menus = menuService.selectStaffDeptMenuList(deptUserId);
+ AjaxResult ajax = success();
ajax.put("checkedKeys", menuService.selectStaffMenuListByDeptUserId(deptUserId));
ajax.put("menus", menuService.buildMenuTreeSelect(menus));
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