mirror of
http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git
synced 2026-08-15 06:02:06 +08:00
晨丰用户登录管理端失败修复
This commit is contained in:
+6
@@ -396,6 +396,12 @@ public class PermissionServiceImpl implements PermissionService {
|
|||||||
roleMenuIds = convertSet(roleMenuMapper.selectListByRoleIdsAndOrganId(roleIds, OrganContextHolder.getOrganId()), RoleMenuDO::getMenuId);
|
roleMenuIds = convertSet(roleMenuMapper.selectListByRoleIdsAndOrganId(roleIds, OrganContextHolder.getOrganId()), RoleMenuDO::getMenuId);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 管理端菜单不按产品套餐过滤,产品维度仅适用于生产端。
|
||||||
|
// 管理端 token 不携带 productId,最终菜单类型会在 AuthController 中继续过滤为管理端菜单。
|
||||||
|
if (SecurityFrameworkUtils.isManageEndPoint()) {
|
||||||
|
return roleMenuIds;
|
||||||
|
}
|
||||||
|
|
||||||
Set<Long> tenantPackageMenuIds = tenantPackageService.getProductTenantPackageMenuIds(SecurityFrameworkUtils.getProductId());
|
Set<Long> tenantPackageMenuIds = tenantPackageService.getProductTenantPackageMenuIds(SecurityFrameworkUtils.getProductId());
|
||||||
|
|
||||||
return Sets.intersection(roleMenuIds, tenantPackageMenuIds);
|
return Sets.intersection(roleMenuIds, tenantPackageMenuIds);
|
||||||
|
|||||||
Reference in New Issue
Block a user