diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/portal/PortalController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/portal/PortalController.java index 7910897..033a38b 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/portal/PortalController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/portal/PortalController.java @@ -109,7 +109,8 @@ public class PortalController extends BaseController { @GetMapping("/resource/catalog/pageList") public TableDataInfo pageList(HttpServletRequest request,SysCatalogResourceBo bo, PageQuery pageQuery) { String tenantId = ServletUtils.getHeader(request, "Tenantid"); - TenantHelper.setDynamic(tenantId); + //TenantHelper.setDynamic(tenantId); + bo.setAncestors(tenantId); return resourceService.queryProtalPageList(bo, pageQuery); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysCatalogResourceMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysCatalogResourceMapper.java index 4d572ff..8d8d3ad 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysCatalogResourceMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysCatalogResourceMapper.java @@ -17,5 +17,5 @@ import org.dromara.system.domain.vo.SysCatalogResourceVo; @Mapper public interface SysCatalogResourceMapper extends BaseMapperPlus { Page selectPageList(@Param("page") Page page, @Param("catalogId") Long catalogId); - Page selectProtalPageList(@Param("page") Page page); + Page selectProtalPageList(@Param("page") Page page,@Param("tenantId") String tenantId); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysCatalogResourceServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysCatalogResourceServiceImpl.java index 9cb7270..aca6351 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysCatalogResourceServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysCatalogResourceServiceImpl.java @@ -95,7 +95,9 @@ public class SysCatalogResourceServiceImpl implements ISysCatalogResourceService public TableDataInfo queryProtalPageList(SysCatalogResourceBo bo, PageQuery pageQuery) { //LambdaQueryWrapper lqw = buildQueryWrapper(bo); //为了兼容 vo中的 @Translation(type = TransConstant.OSS_ID_TO_URL) - IPage result = baseMapper.selectProtalPageList(pageQuery.build()); + //临时存放 + String tenantId = bo.getAncestors(); + IPage result = baseMapper.selectProtalPageList(pageQuery.build(), tenantId); return TableDataInfo.build(result); } diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/StatisticMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/StatisticMapper.xml index 33faceb..23fc32c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/StatisticMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/StatisticMapper.xml @@ -4,19 +4,20 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">