diff --git a/keyboard-server/src/main/java/com/yolo/keyboard/service/tenantwithdraworder/KeyboardTenantWithdrawOrderServiceImpl.java b/keyboard-server/src/main/java/com/yolo/keyboard/service/tenantwithdraworder/KeyboardTenantWithdrawOrderServiceImpl.java index 655fc5c..4d99f82 100644 --- a/keyboard-server/src/main/java/com/yolo/keyboard/service/tenantwithdraworder/KeyboardTenantWithdrawOrderServiceImpl.java +++ b/keyboard-server/src/main/java/com/yolo/keyboard/service/tenantwithdraworder/KeyboardTenantWithdrawOrderServiceImpl.java @@ -90,19 +90,32 @@ public class KeyboardTenantWithdrawOrderServiceImpl implements KeyboardTenantWit Long currentTenantId = TenantContextHolder.getTenantId(); if (currentTenantId != null) { TenantDO currentTenant = tenantMapper.selectById(currentTenantId); - if (currentTenant != null && currentTenant.getTenantLevel() != null - && currentTenant.getTenantLevel() != 0) { - // 非系统管理员:只能查看直属下级租户的提现申请 - List subordinateTenants = tenantMapper.selectList( - new LambdaQueryWrapper().eq(TenantDO::getParentId, currentTenantId)); - List subordinateTenantIds = subordinateTenants.stream() - .map(TenantDO::getId) - .collect(Collectors.toList()); - if (CollUtil.isEmpty(subordinateTenantIds)) { - // 没有下级租户,返回空结果 - return PageResult.empty(0L); + if (currentTenant != null && currentTenant.getTenantLevel() != null) { + if (currentTenant.getTenantLevel() == 0) { + // 系统管理员:只能查看1级代理的提现申请 + List firstLevelAgents = tenantMapper.selectList( + new LambdaQueryWrapper().eq(TenantDO::getTenantLevel, 1)); + List firstLevelAgentIds = firstLevelAgents.stream() + .map(TenantDO::getId) + .collect(Collectors.toList()); + if (CollUtil.isEmpty(firstLevelAgentIds)) { + // 没有1级代理,返回空结果 + return PageResult.empty(0L); + } + pageReqVO.setTenantIds(firstLevelAgentIds); + } else { + // 非系统管理员:只能查看直属下级租户的提现申请 + List subordinateTenants = tenantMapper.selectList( + new LambdaQueryWrapper().eq(TenantDO::getParentId, currentTenantId)); + List subordinateTenantIds = subordinateTenants.stream() + .map(TenantDO::getId) + .collect(Collectors.toList()); + if (CollUtil.isEmpty(subordinateTenantIds)) { + // 没有下级租户,返回空结果 + return PageResult.empty(0L); + } + pageReqVO.setTenantIds(subordinateTenantIds); } - pageReqVO.setTenantIds(subordinateTenantIds); } }