From 500feb74cb8f5c2cef9c9941532ba8a3f1c8f059 Mon Sep 17 00:00:00 2001
From: ziin <hiziying@hotmail.com>
Date: Mon, 24 Nov 2025 14:08:46 +0800
Subject: [PATCH] =?UTF-8?q?fix(system):=20=E9=99=90=E5=88=B6=E7=A7=9F?=
 =?UTF-8?q?=E6=88=B7=E5=8F=AA=E8=83=BD=E6=9F=A5=E7=9C=8B=E8=87=AA=E5=B7=B1?=
 =?UTF-8?q?=E7=9A=84=E7=A7=AF=E5=88=86=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mysql/tenantpoints/TenantPointsMapper.java   | 16 ++++++++++++++++
 .../tenantpoints/TenantPointsServiceImpl.java    |  8 +++++++-
 2 files changed, 23 insertions(+), 1 deletion(-)

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<TenantPointsDO> {
                 .eq(TenantPointsDO::getTenantId, tenantId)
                 .orderByDesc(TenantPointsDO::getCreatedAt));
     }
+
+    default PageResult<TenantPointsDO> selectPageWithTenantId(TenantPointsPageReqVO reqVO, Long tenantId) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<TenantPointsDO>()
+                .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<TenantPointsDO> getTenantPointsPage(TenantPointsPageReqVO pageReqVO) {
-        return tenantPointsMapper.selectPage(pageReqVO);
+        Long tenantId = TenantContextHolder.getTenantId();
+        if (tenantId == 1) {
+            return tenantPointsMapper.selectPage(pageReqVO);
+        }
+        return tenantPointsMapper.selectPageWithTenantId(pageReqVO,tenantId);
+
     }
 
     @Override