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