From 640ff18d2d7f4be02ddb7f8f75e899f05545eb98 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 05 二月 2024 11:56:52 +0800
Subject: [PATCH] 更新bug修改
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/MenuController.java | 22 ++++++----------------
1 files changed, 6 insertions(+), 16 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/MenuController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/MenuController.java
index e3da6d0..87ca89d 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/MenuController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/MenuController.java
@@ -1,5 +1,6 @@
package com.dsh.guns.modular.system.controller.system;
+import cn.hutool.core.collection.CollectionUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.dsh.course.model.node.ZTreeNode;
import com.dsh.guns.config.UserExt;
@@ -132,21 +133,6 @@
public Object list(@RequestParam(required = false) String menuName, @RequestParam(required = false) String level) {
Integer language = UserExt.getLanguage();
List<Map<String, Object>> menus = this.menuService.selectMenus(menuName, level);
- if(language==1 || language==null){
-
- }else if(language==2){
- for (Map<String, Object> menu : menus) {
- menu.put("name",menu.get("ename"));
- }
- }else if(language==3){
- for (Map<String, Object> menu : menus) {
- menu.put("name",menu.get("bname"));
- }
- }
- for (Map<String, Object> menu : menus) {
- menu.put("id",menu.get("id").toString());
- }
-
return super.warpObject(new MenuWarpper(menus));
}
@@ -244,10 +230,14 @@
@ResponseBody
public List<ZTreeNode> menuTreeListByRoleId(@PathVariable Integer roleId) {
List<Long> menuIds = this.menuService.getMenuIdsByRoleId(roleId);
- if (Objects.isNull(menuIds)) {
+ System.out.println("=====menuIds==========="+menuIds);
+ if (CollectionUtil.isEmpty(menuIds)) {
+ System.out.println("=====menuIds1==========="+menuIds);
+
List<ZTreeNode> roleTreeList = this.menuService.menuTreeList();
return roleTreeList;
} else {
+
// List<ZTreeNode> roleTreeList = this.menuService.menuTreeList();
List<ZTreeNode> roleTreeListByUserId = this.menuService.menuTreeListByMenuIds(menuIds);
return roleTreeListByUserId;
--
Gitblit v1.7.1