From 8afc5bfc1e5df1e2f0a8872a344da3b3fd5d63b9 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 11 四月 2025 20:24:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/MenuController.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 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 05c1a31..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;
@@ -229,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