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/MenuServiceImpl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/iailab-module-system/iailab-module-system-biz/src/main/java/com/iailab/module/system/service/permission/MenuServiceImpl.java b/iailab-module-system/iailab-module-system-biz/src/main/java/com/iailab/module/system/service/permission/MenuServiceImpl.java
index d3c0c46..1497663 100644
--- a/iailab-module-system/iailab-module-system-biz/src/main/java/com/iailab/module/system/service/permission/MenuServiceImpl.java
+++ b/iailab-module-system/iailab-module-system-biz/src/main/java/com/iailab/module/system/service/permission/MenuServiceImpl.java
@@ -158,8 +158,10 @@
@Override
public List<MenuDO> getAppMenuListByTenant(MenuListReqVO reqVO) {
+ // 获取 tenantId
+ Long tenantId = getTenantId();
// 查询所有菜单，并过滤掉关闭的节点
- List<MenuDO> menus = getAppMenuList(reqVO);
+ List<MenuDO> menus = getAppMenuList(tenantId, reqVO);
// 开启多租户的情况下，需要过滤掉未开通的菜单
tenantService.handleTenantMenu(menuIds -> menus.removeIf(menu -> !CollUtil.contains(menuIds, menu.getId())));
return menus;
@@ -215,9 +217,7 @@
}
@Override
- public List<MenuDO> getAppMenuList(MenuListReqVO reqVO) {
- // 获取 tenantId
- Long tenantId = getTenantId();
+ public List<MenuDO> getAppMenuList(Long tenantId, MenuListReqVO reqVO) {
List<MenuDO> menuDOS = menuMapper.selectAppMenuList(tenantId, reqVO);
Set<Long> menuDOIds = menuDOS.stream().map(MenuDO::getId).collect(Collectors.toSet());
// 获得角色列表
--
Gitblit v1.9.3