From ce910c8cec901b061317d4ccc6373c2b03cdfbf6 Mon Sep 17 00:00:00 2001
From: houzhongjian <houzhongyi@126.com>
Date: 星期四, 24 十月 2024 17:41:06 +0800
Subject: [PATCH] 1、修改应用菜单权限等，增加根据应用id查询该应用下的二级菜单，并且转成一级菜单展示 2、数据采集模块增加大华和海康摄像头的sdk工具及相关代码 3、移除data和model模块iailab-common-biz-data-permission依赖重复，解决打包报错的bug 4、data-biz模块左右openscada依赖都需要排除bcprov-jdk15on，否则会导致打包报错 5、其它相关修改
---
iailab-module-system/iailab-module-system-biz/src/main/java/com/iailab/module/system/service/permission/PermissionServiceImpl.java | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/iailab-module-system/iailab-module-system-biz/src/main/java/com/iailab/module/system/service/permission/PermissionServiceImpl.java b/iailab-module-system/iailab-module-system-biz/src/main/java/com/iailab/module/system/service/permission/PermissionServiceImpl.java
index 06ea1cb..0ad56ef 100644
--- a/iailab-module-system/iailab-module-system-biz/src/main/java/com/iailab/module/system/service/permission/PermissionServiceImpl.java
+++ b/iailab-module-system/iailab-module-system-biz/src/main/java/com/iailab/module/system/service/permission/PermissionServiceImpl.java
@@ -239,15 +239,14 @@
if (CollUtil.isEmpty(roleIds)) {
return Collections.emptySet();
}
-
+ // 获取 tenantId
+ Long tenantId = getTenantId();
// 如果是管理员的情况下，获取全部应用菜单编号
if (roleService.hasAnySuperAdmin(roleIds)) {
MenuListReqVO reqVO = new MenuListReqVO();
- return convertSet(menuService.getAppMenuList(reqVO), MenuDO::getId);
+ return convertSet(menuService.getAppMenuList(tenantId, reqVO), MenuDO::getId);
}
// 如果是非管理员的情况下，获得拥有的应用菜单编号
- // 获取 tenantId
- Long tenantId = getTenantId();
TenantDO tenant = tenantService.getTenant(tenantId);
TenantPackageDO tenantPackage = tenantPackageService.getTenantPackage(tenant.getPackageId());
Set<Long> menuIds = tenantPackage.getMenuIds();
--
Gitblit v1.9.3