|
|
@@ -5,6 +5,7 @@ import cn.hutool.core.util.ObjUtil;
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
|
import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
|
|
|
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
|
|
|
+import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder;
|
|
|
import cn.iocoder.yudao.module.system.controller.admin.permission.vo.menu.MenuListReqVO;
|
|
|
import cn.iocoder.yudao.module.system.controller.admin.permission.vo.menu.MenuSaveVO;
|
|
|
import cn.iocoder.yudao.module.system.dal.dataobject.permission.MenuDO;
|
|
|
@@ -171,9 +172,13 @@ public class MenuServiceImpl extends ServiceImpl<MenuMapper, MenuDO> implements
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- @Cacheable(value = RedisKeyConstants.PERMISSION_MENU_ID_LIST, key = "#permission")
|
|
|
+ // @Cacheable(value = RedisKeyConstants.PERMISSION_MENU_ID_LIST, key = "#permission") // 源码
|
|
|
+ //@Cacheable(value = RedisKeyConstants.PERMISSION_MENU_ID_LIST, // 后加
|
|
|
+ // // SpEL表达式直接获取租户ID并拼接
|
|
|
+ // key = "T(cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder).getTenantId() + ':' + #permission")
|
|
|
public List<Long> getMenuIdListByPermissionFromCache(String permission) {
|
|
|
- List<MenuDO> menus = menuMapper.selectListByPermission(permission);
|
|
|
+ Long tenantId = TenantContextHolder.getTenantId();
|
|
|
+ List<MenuDO> menus = menuMapper.selectListByPermission(permission, tenantId);
|
|
|
return convertList(menus, MenuDO::getId);
|
|
|
}
|
|
|
|