From a8da54c130421a82542ef21b89d5c7b38be47879 Mon Sep 17 00:00:00 2001 From: ziin Date: Tue, 30 Dec 2025 21:54:07 +0800 Subject: [PATCH] =?UTF-8?q?fix(tenant):=20=E9=99=90=E5=88=B6=E4=B8=80?= =?UTF-8?q?=E7=BA=A7=E4=BB=A3=E7=90=86=E5=8F=AA=E8=83=BD=E6=9F=A5=E7=9C=8B?= =?UTF-8?q?=E7=9B=B4=E5=B1=9E=E4=B8=8B=E7=BA=A7=E7=A7=9F=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/system/dal/mysql/tenant/TenantMapper.java | 1 + .../module/system/service/tenant/TenantServiceImpl.java | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/yolo-module-system/src/main/java/com/yolo/keyboard/module/system/dal/mysql/tenant/TenantMapper.java b/yolo-module-system/src/main/java/com/yolo/keyboard/module/system/dal/mysql/tenant/TenantMapper.java index 83a6aaa..d5391bb 100644 --- a/yolo-module-system/src/main/java/com/yolo/keyboard/module/system/dal/mysql/tenant/TenantMapper.java +++ b/yolo-module-system/src/main/java/com/yolo/keyboard/module/system/dal/mysql/tenant/TenantMapper.java @@ -19,6 +19,7 @@ public interface TenantMapper extends BaseMapperX { .likeIfPresent(TenantDO::getContactName, reqVO.getContactName()) .likeIfPresent(TenantDO::getContactMobile, reqVO.getContactMobile()) .eqIfPresent(TenantDO::getStatus, reqVO.getStatus()) + .eqIfPresent(TenantDO::getParentId, reqVO.getParentId()) .betweenIfPresent(TenantDO::getCreateTime, reqVO.getCreateTime()) .orderByDesc(TenantDO::getId)); } diff --git a/yolo-module-system/src/main/java/com/yolo/keyboard/module/system/service/tenant/TenantServiceImpl.java b/yolo-module-system/src/main/java/com/yolo/keyboard/module/system/service/tenant/TenantServiceImpl.java index 21adf5c..a0a3886 100644 --- a/yolo-module-system/src/main/java/com/yolo/keyboard/module/system/service/tenant/TenantServiceImpl.java +++ b/yolo-module-system/src/main/java/com/yolo/keyboard/module/system/service/tenant/TenantServiceImpl.java @@ -285,6 +285,15 @@ public class TenantServiceImpl implements TenantService { @Override public PageResult getTenantPage(TenantPageReqVO pageReqVO) { + // 如果当前租户是一级代理（tenantLevel=1），只能查询自己的下级租户 + Long currentTenantId = TenantContextHolder.getTenantId(); + if (currentTenantId != null) { + TenantDO currentTenant = tenantMapper.selectById(currentTenantId); + if (currentTenant != null && currentTenant.getTenantLevel() != null + && currentTenant.getTenantLevel() == 1) { + pageReqVO.setParentId(currentTenantId); + } + } return tenantMapper.selectPage(pageReqVO); }