From ba93797e4895e64553df88629296df5300b7862b Mon Sep 17 00:00:00 2001 From: ludc Date: 星期四, 12 十月 2023 10:32:49 +0800 Subject: [PATCH] 修改bug提交 --- Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/MenuServiceImpl.java | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/MenuServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/MenuServiceImpl.java index 7a8879c..344a9ef 100644 --- a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/MenuServiceImpl.java +++ b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/MenuServiceImpl.java @@ -150,7 +150,9 @@ @Override public List<TreeNode> grantTree(BladeUser user) { - List<TreeNode> menuTree = user.getTenantId().equals(nacosConfigCache.getAdminUserInfo().getTenantId()) ? baseMapper.grantTree() : baseMapper.grantTreeByRole(Func.toLongList(user.getRoleId())); + List<TreeNode> menuTree = user.getTenantId().equals(nacosConfigCache.getAdminUserInfo().getTenantId()) + && user.getUserId().equals(nacosConfigCache.getAdminUserInfo().getUserId()) + ? baseMapper.grantTree() : baseMapper.grantTreeByRole(Func.toLongList(user.getRoleId())); return ForestNodeMerger.merge(tenantPackageTree(menuTree, user.getTenantId())); } -- Gitblit v1.9.3