From b716afd262ff60ff1db0b1e7c95800e7ad2b7202 Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期一, 07 七月 2025 11:07:37 +0800 Subject: [PATCH] 支付版本更新 根据资金流向使用V2或V3服务商版本支付 --- 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