From 5d24626495787fbff5974a7e7bd7048dfe0b0ea3 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期五, 26 一月 2024 15:45:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/MenuServiceImpl.java | 2 +-
1 files changed, 1 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 9139a1f..c577eee 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
@@ -99,7 +99,6 @@
List<Menu> allMenus = baseMapper.allMenu();
List<Menu> roleMenus;
// 瓒呯骇绠＄悊鍛樺苟涓斾笉鏄《閮ㄨ彍鍗曡姹傚垯杩斿洖鍏ㄩ儴鑿滃崟
- // if (AuthUtil.isAdministrator() && Func.isEmpty(topMenuId)) {
if (VciBaseUtil.checkAdminTenant() && Func.isEmpty(topMenuId)) {
roleMenus = allMenus;
}
@@ -229,6 +228,7 @@
* 绉熸埛鑿滃崟鏉冮檺鑷畾涔夌瓫閫�
*/
private List<Menu> tenantPackageMenu(List<Menu> menu) {
+ // 绉熸埛鍖呴厤缃煡璇�
TenantPackage tenantPackage = SysCache.getTenantPackage(AuthUtil.getTenantId());
if (Func.isNotEmpty(tenantPackage) && tenantPackage.getId() > 0L) {
List<Long> menuIds = Func.toLongList(tenantPackage.getMenuId());
--
Gitblit v1.9.3