From 8f9f020bde3c7a5cecdad867e1034d570a8e8eb1 Mon Sep 17 00:00:00 2001 From: ludc Date: 星期五, 27 十月 2023 17:14:57 +0800 Subject: [PATCH] 前端代码打包 --- Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/MenuServiceImpl.java | 6 ++++-- 1 files changed, 4 insertions(+), 2 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 06b47de..23d66c4 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 @@ -151,9 +151,11 @@ @Override public List<TreeNode> grantTree(BladeUser user) { - List<TreeNode> menuTree = user.getTenantId().equals(nacosConfigCache.getAdminUserInfo().getTenantId()) + /*List<TreeNode> menuTree = user.getTenantId().equals(nacosConfigCache.getAdminUserInfo().getTenantId()) && user.getUserId().equals(nacosConfigCache.getAdminUserInfo().getUserId()) - ? baseMapper.grantTree() : baseMapper.grantTreeByRole(Func.toLongList(user.getRoleId())); + ? baseMapper.grantTree() : baseMapper.grantTreeByRole(Func.toLongList(user.getRoleId()));*/ + // 淇敼涓烘墍鏈夌敤鎴烽兘鑳芥煡璇㈡墍鏈夛紝鍥犱负娌℃潈闄愮殑鐢ㄦ埛涓嶅叿澶囪繖涓彍鍗曢〉闈㈢殑鏉冮檺锛屼篃灏辨病蹇呰闄愬埗鐢ㄦ埛鏌ヨ嚜宸辩殑 + List<TreeNode> menuTree = baseMapper.grantTree(); return ForestNodeMerger.merge(tenantPackageTree(menuTree, user.getTenantId())); } -- Gitblit v1.9.3