From 299bc5e28b8a0349fd32566a1822499d865a8574 Mon Sep 17 00:00:00 2001
From: ziin <hiziying@hotmail.com>
Date: Tue, 6 Jan 2026 19:21:10 +0800
Subject: [PATCH] =?UTF-8?q?fix(service):=20=E4=BF=AE=E5=A4=8D=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E7=AE=A1=E7=90=86=E5=91=98=E5=8F=AA=E8=83=BD=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B1=E7=BA=A7=E4=BB=A3=E7=90=86=E6=8F=90=E7=8E=B0?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=E7=9A=84=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...eyboardTenantWithdrawOrderServiceImpl.java | 37 +++++++++++++------
 1 file changed, 25 insertions(+), 12 deletions(-)

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<TenantDO> subordinateTenants = tenantMapper.selectList(
-                        new LambdaQueryWrapper<TenantDO>().eq(TenantDO::getParentId, currentTenantId));
-                List<Long> 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<TenantDO> firstLevelAgents = tenantMapper.selectList(
+                            new LambdaQueryWrapper<TenantDO>().eq(TenantDO::getTenantLevel, 1));
+                    List<Long> firstLevelAgentIds = firstLevelAgents.stream()
+                            .map(TenantDO::getId)
+                            .collect(Collectors.toList());
+                    if (CollUtil.isEmpty(firstLevelAgentIds)) {
+                        // 没有1级代理，返回空结果
+                        return PageResult.empty(0L);
+                    }
+                    pageReqVO.setTenantIds(firstLevelAgentIds);
+                } else {
+                    // 非系统管理员：只能查看直属下级租户的提现申请
+                    List<TenantDO> subordinateTenants = tenantMapper.selectList(
+                            new LambdaQueryWrapper<TenantDO>().eq(TenantDO::getParentId, currentTenantId));
+                    List<Long> subordinateTenantIds = subordinateTenants.stream()
+                            .map(TenantDO::getId)
+                            .collect(Collectors.toList());
+                    if (CollUtil.isEmpty(subordinateTenantIds)) {
+                        // 没有下级租户，返回空结果
+                        return PageResult.empty(0L);
+                    }
+                    pageReqVO.setTenantIds(subordinateTenantIds);
                 }
-                pageReqVO.setTenantIds(subordinateTenantIds);
             }
         }