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); }