From 01c0d28076bedb7c76e4faae1cfaa8732f861e5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E8=87=AA=E8=BE=BE?= <980324341@qq.com> Date: Mon, 5 Oct 2026 14:39:20 +0800 Subject: [PATCH] =?UTF-8?q?test(=E5=85=AC=E5=8F=B8tab):=20=E8=A1=A5?= =?UTF-8?q?=E3=80=8C=E8=B6=85=E7=AE=A1=E9=80=89=E4=BA=86=E5=85=AC=E5=8F=B8?= =?UTF-8?q?=E4=BD=86=E6=B2=A1=E9=80=89=E5=88=86=E7=BB=84=E3=80=8D=E8=BF=99?= =?UTF-8?q?=E6=9D=A1=E6=B0=B4=E8=B7=AF=E7=9A=84=E7=94=A8=E4=BE=8B=EF=BC=8C?= =?UTF-8?q?=E5=B9=B6=E8=AE=A2=E6=AD=A3=E7=BC=BA=E5=8F=A3=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E7=9A=84=E4=BB=BB=E5=8A=A1=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 变异目录第 8 轮(ReadScope.userIdsOr 的 base==null 腿退化成空集)第一轮**存活**, 66 支一支不红。不是变异点在 mock 外面,而是这一轮两页都没测这条路径——而 tab 默认选中第一家,超管开页走的恰恰就是它(base=null + 公司集 ⇒ 本应交出公司成员集, 被 Mutation 打成空页时无人报警)。两页各补一条同形用例后重放:C0' 68 全绿、 M8 RED 2,红的正是这两条 ⇒ 变异 9/9。 顺带订正登记表里两条会误导人的任务号(按 docs/plans/19-company-tab.md 的任务标题): admin_task_center 归 Task 10、admin_device_logs 归 Task 12(原先写成 9/10,差一笔)。 验证(验证树 D:/tmp-wt-19ct,基线 = 当前 HEAD 3724e1e4 + 我这 3 支文件): - 后端全量 3732 / 0 failures / 0 errors / 7 skipped,BUILD SUCCESS。 - 计时用例 HttpClientTimeoutEffectiveTest 上一轮全量里红过一次 (根因读到 "connection closed locally" 而非超时),单跑 8/8 绿、本轮全量 8/8 绿 ⇒ 判为并发负载下的假红,不在我的差分里(我的改动只碰 usersecret 的两支测试与一份登记表注释)。 - 前端 1726 例 / 1725 绿 / 1 红 = 缺口尺子本身(还剩 4 页未接线,设计内);vue-tsc rc=0。 --- admin-frontend-vue/tests/company-tab-wiring.test.ts | 4 ++-- .../usersecret/service/UserApiSecretServiceTest.java | 11 +++++++++++ .../service/UserSecretUsageServiceTest.java | 11 +++++++++++ 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/admin-frontend-vue/tests/company-tab-wiring.test.ts b/admin-frontend-vue/tests/company-tab-wiring.test.ts index ae2750199..83bdde25e 100644 --- a/admin-frontend-vue/tests/company-tab-wiring.test.ts +++ b/admin-frontend-vue/tests/company-tab-wiring.test.ts @@ -47,7 +47,7 @@ const COMPANY_ID_SOURCE_PINS: Readonly> }, ], admin_task_center: [ - { file: 'src/api/task-center.ts', shape: null, note: 'Task 9 未接线(已在缺口清单里);谁接线谁把 null 换成本函数真实取值口' }, + { file: 'src/api/task-center.ts', shape: null, note: 'Task 10 未接线(已在缺口清单里);谁接线谁把 null 换成本函数真实取值口' }, { file: 'src/pages/task-center/task-center-model.ts', shape: null, note: '同上:这一页有两个取数模块,两个都得登记' }, ], admin_user_secret_usage: [ @@ -67,7 +67,7 @@ const COMPANY_ID_SOURCE_PINS: Readonly> }, ], admin_device_logs: [ - { file: 'src/api/device-logs.ts', shape: null, note: 'Task 10 未接线(已在缺口清单里)' }, + { file: 'src/api/device-logs.ts', shape: null, note: 'Task 12 未接线(已在缺口清单里)' }, ], admin_group_manage: [ { file: 'src/pages/account/shop-group-api.ts', shape: null, note: 'Task 11 未接线(已在缺口清单里)' }, diff --git a/backend-java/src/test/java/com/nanri/aiimage/modules/usersecret/service/UserApiSecretServiceTest.java b/backend-java/src/test/java/com/nanri/aiimage/modules/usersecret/service/UserApiSecretServiceTest.java index 818cb6722..355a4670c 100644 --- a/backend-java/src/test/java/com/nanri/aiimage/modules/usersecret/service/UserApiSecretServiceTest.java +++ b/backend-java/src/test/java/com/nanri/aiimage/modules/usersecret/service/UserApiSecretServiceTest.java @@ -667,6 +667,17 @@ class UserApiSecretServiceTest { assertThat(service.scopedUserIds(operator, null, ReadScope.unfiltered())).isNull(); } + @Test + @DisplayName("超管选了公司但没选分组:base 为 null 时必须交出公司成员集(tab 默认选中第一家,这是最普通的水路)") + void superAdminWithCompanyAndNoGroupYieldsCompanySet() { + UserApiSecretService service = newService(); + AdminUserEntity operator = new AdminUserEntity(); + operator.setId(88L); + when(adminAuthSupport.currentRole(operator)).thenReturn("super_admin"); + assertThat(service.scopedUserIds(operator, null, ReadScope.users(List.of(11L, 12L)))) + .containsExactlyInAnyOrder(11L, 12L); + } + @Test @DisplayName("主管:组长锁定 ∩ 公司成员集;越界公司的成员集是空集 ⇒ 空页,不是全量") void leaderVisibleSetIsNarrowedByCompany() { diff --git a/backend-java/src/test/java/com/nanri/aiimage/modules/usersecret/service/UserSecretUsageServiceTest.java b/backend-java/src/test/java/com/nanri/aiimage/modules/usersecret/service/UserSecretUsageServiceTest.java index 6b55607e2..692416da2 100644 --- a/backend-java/src/test/java/com/nanri/aiimage/modules/usersecret/service/UserSecretUsageServiceTest.java +++ b/backend-java/src/test/java/com/nanri/aiimage/modules/usersecret/service/UserSecretUsageServiceTest.java @@ -241,6 +241,17 @@ class UserSecretUsageServiceTest { .containsExactlyInAnyOrder(1L, 2L, 88L); } + @Test + @DisplayName("用量统计:超管选了公司但没选分组时 base 为 null,必须交出公司成员集(tab 默认选中第一家的水路)") + void superAdminWithCompanyAndNoGroupYieldsCompanySet() { + UserSecretUsageService service = newService(); + AdminUserEntity operator = new AdminUserEntity(); + operator.setId(88L); + when(adminAuthSupport.currentRole(any())).thenReturn("super_admin"); + assertThat(service.scopedUserIds(operator, null, ReadScope.users(List.of(11L, 12L)))) + .containsExactlyInAnyOrder(11L, 12L); + } + @BeforeEach void attachLogAppender() { Logger logger = (Logger) LoggerFactory.getLogger(UserSecretUsageService.class);