diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/tenantpoints/TenantPointsMapper.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/tenantpoints/TenantPointsMapper.java index 440fdcb..d503940 100644 --- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/tenantpoints/TenantPointsMapper.java +++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/tenantpoints/TenantPointsMapper.java @@ -37,4 +37,20 @@ public interface TenantPointsMapper extends BaseMapperX { .eq(TenantPointsDO::getTenantId, tenantId) .orderByDesc(TenantPointsDO::getCreatedAt)); } + + default PageResult selectPageWithTenantId(TenantPointsPageReqVO reqVO, Long tenantId) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .eq(TenantPointsDO::getTenantId, tenantId) + .eqIfPresent(TenantPointsDO::getPoints, reqVO.getPoints()) + .eqIfPresent(TenantPointsDO::getBalance, reqVO.getBalance()) + .eqIfPresent(TenantPointsDO::getType, reqVO.getType()) + .eqIfPresent(TenantPointsDO::getDescription, reqVO.getDescription()) + .eqIfPresent(TenantPointsDO::getOrderId, reqVO.getOrderId()) + .eqIfPresent(TenantPointsDO::getBizNo, reqVO.getBizNo()) + .eqIfPresent(TenantPointsDO::getOperatorId, reqVO.getOperatorId()) + .eqIfPresent(TenantPointsDO::getTargetTenantId, reqVO.getTargetTenantId()) + .eqIfPresent(TenantPointsDO::getCreatedAt, reqVO.getCreatedAt()) + .orderByDesc(TenantPointsDO::getId)); + } + } \ No newline at end of file diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/tenantpoints/TenantPointsServiceImpl.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/tenantpoints/TenantPointsServiceImpl.java index 941e414..a7e0c30 100644 --- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/tenantpoints/TenantPointsServiceImpl.java +++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/tenantpoints/TenantPointsServiceImpl.java @@ -1,6 +1,7 @@ package cn.iocoder.yudao.module.system.service.tenantpoints; import cn.hutool.core.collection.CollUtil; +import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -86,7 +87,12 @@ public class TenantPointsServiceImpl implements TenantPointsService { @Override public PageResult getTenantPointsPage(TenantPointsPageReqVO pageReqVO) { - return tenantPointsMapper.selectPage(pageReqVO); + Long tenantId = TenantContextHolder.getTenantId(); + if (tenantId == 1) { + return tenantPointsMapper.selectPage(pageReqVO); + } + return tenantPointsMapper.selectPageWithTenantId(pageReqVO,tenantId); + } @Override