From 75f3d8e5ce0deca7a04be95f0222883441e3aed2 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 23:16:39 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E8=A7=92=E8=89=B2=E5=8F=AB=E6=B3=95):=20?= =?UTF-8?q?=E8=A1=A5=E9=BD=90=E4=B8=8A=E4=B8=80=E7=AC=94=E6=BC=8F=E8=BF=9B?= =?UTF-8?q?=E7=9A=84=E4=B8=89=E6=94=AF=E6=B5=8B=E8=AF=95=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 0e6e8449 的提交树里这三份 .java 仍留着「普通管理员」⇒ 干净检出的树会让新增的旧词扫描用例 判红(本地工作区因为我没提交的改动而恰好是绿的,掩盖住了)。逐条核对 diff 只有注释行。 --- .../modules/permission/PermissionCompanyMenuHiddenTest.java | 4 ++-- .../modules/permission/service/PermissionMenuServiceTest.java | 2 +- .../modules/permission/service/support/Task152Test.java | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/backend-java/src/test/java/com/nanri/aiimage/modules/permission/PermissionCompanyMenuHiddenTest.java b/backend-java/src/test/java/com/nanri/aiimage/modules/permission/PermissionCompanyMenuHiddenTest.java index db82ce394..4158c61ce 100644 --- a/backend-java/src/test/java/com/nanri/aiimage/modules/permission/PermissionCompanyMenuHiddenTest.java +++ b/backend-java/src/test/java/com/nanri/aiimage/modules/permission/PermissionCompanyMenuHiddenTest.java @@ -390,7 +390,7 @@ class PermissionCompanyMenuHiddenTest { } /** - * 出口 3(普通管理员操作者):自己范围外、且历史上挂在目标身上的这条,既不能被"新增"回来, + * 出口 3(管理员操作者):自己范围外、且历史上挂在目标身上的这条,既不能被"新增"回来, * 也不能因为剥离而顺手被删掉——删除范围只由操作者可授予集算出来,与提交集合无关。 */ @Test @@ -403,7 +403,7 @@ class PermissionCompanyMenuHiddenTest { when(menuMapper.selectList(any())).thenReturn(catalog()); when(menuMapper.selectOne(any())).thenReturn(null); when(userMapper.selectList(any())).thenReturn(List.of()); - // 操作者(普通管理员 30)自己并没有这条 + // 操作者(管理员 30)自己并没有这条 when(permissionMapper.selectByUserId(30L)).thenReturn(List.of(grant(30L, SIBLING_PAGE_ID))); when(permissionMapper.selectByUserId(7L)).thenReturn(List.of(grant(7L, COMPANY_MENU_ID))); diff --git a/backend-java/src/test/java/com/nanri/aiimage/modules/permission/service/PermissionMenuServiceTest.java b/backend-java/src/test/java/com/nanri/aiimage/modules/permission/service/PermissionMenuServiceTest.java index 90d019853..525359b63 100644 --- a/backend-java/src/test/java/com/nanri/aiimage/modules/permission/service/PermissionMenuServiceTest.java +++ b/backend-java/src/test/java/com/nanri/aiimage/modules/permission/service/PermissionMenuServiceTest.java @@ -1295,7 +1295,7 @@ class PermissionMenuServiceTest { /** * 目标用户已持有的授权(通常由超管分配)不参与「只能授自己已有的」校验: - * 普通管理员编辑该用户时整树提交会把它原样带回,若一并判为越权,整笔事务回滚, + * 管理员编辑该用户时整树提交会把它原样带回,若一并判为越权,整笔事务回滚, * 连建号/改密都做不成——即生产 2026-09-16 的现象。 */ @Test diff --git a/backend-java/src/test/java/com/nanri/aiimage/modules/permission/service/support/Task152Test.java b/backend-java/src/test/java/com/nanri/aiimage/modules/permission/service/support/Task152Test.java index e0e2743b8..966435b39 100644 --- a/backend-java/src/test/java/com/nanri/aiimage/modules/permission/service/support/Task152Test.java +++ b/backend-java/src/test/java/com/nanri/aiimage/modules/permission/service/support/Task152Test.java @@ -9,7 +9,7 @@ import java.util.Map; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -/** task-152:普通管理员菜单树(仅有效授权子集)。 */ +/** task-152:管理员菜单树(仅有效授权子集)。 */ class Task152Test { private PermissionMenuItemVo m(Long id, String key) { @@ -26,7 +26,7 @@ class Task152Test { @Test void test_task_152_implement_normal_primary_path() { - // 普通管理员只拿到 2 项授权 + // 管理员只拿到 2 项授权 List> tree = AdminMenuTreeBuilder.toMapList(AdminMenuTreeBuilder.build(List.of( m(1L, "a"), m(2L, "b")))); assertEquals(2, tree.size());