From 2c47b277462f07fdfcdf37eb90483ab9209f8e2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E8=87=AA=E8=BE=BE?= <980324341@qq.com> Date: Wed, 23 Sep 2026 15:56:50 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E7=94=A8=E6=88=B7=E6=8E=88=E6=9D=83):=20?= =?UTF-8?q?=E9=9D=9E=E8=B6=85=E7=AE=A1=E6=8E=88=E6=9D=83=E6=A0=91=E5=8F=AA?= =?UTF-8?q?=E4=B8=8B=E5=8F=91=E8=87=AA=E5=B7=B1=E5=8F=AF=E6=8E=88=E4=BA=88?= =?UTF-8?q?=E7=9A=84=E8=8F=9C=E5=8D=95=EF=BC=8C=E4=BF=9D=E5=AD=98=E6=8C=89?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E8=80=85=E8=8C=83=E5=9B=B4=E6=9B=BF=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 授权树读接口新增 grantableOnly:非超管只返回自己已持有的菜单,可授予项的 祖先分组随行但置灰不可勾;否则勾父会连带授予树上未下发的范围外后代 - 保存的整树替换把删除范围收窄到操作者可授予集,范围外既有授权(超管直接 分配的)原样保留——隐藏项不在提交里,全类型删除会把它们静默清掉 - 前端提交剔除置灰分组的派生勾选;菜单权限配置页仍走全量目录 --- .../src/pages/account/UserMenuAuthTree.vue | 3 +- .../src/pages/account/user-menu-auth-api.ts | 9 +- .../src/pages/account/user-menu-auth.ts | 16 +++- .../tests/align-user-menu-grantable.test.ts | 48 +++++++++-- .../controller/PermissionMenuController.java | 8 +- .../service/PermissionMenuService.java | 65 +++++++++++---- .../PermissionMenuControllerTest.java | 20 ++--- .../service/PermissionMenuServiceTest.java | 82 ++++++++++++++++++- 8 files changed, 203 insertions(+), 48 deletions(-) diff --git a/admin-frontend-vue/src/pages/account/UserMenuAuthTree.vue b/admin-frontend-vue/src/pages/account/UserMenuAuthTree.vue index 670bfec86..592f4d01f 100644 --- a/admin-frontend-vue/src/pages/account/UserMenuAuthTree.vue +++ b/admin-frontend-vue/src/pages/account/UserMenuAuthTree.vue @@ -35,7 +35,8 @@ function onCheck(): void { const ids = [...collect(adminTree.value), ...collect(appTree.value)] // 父子联动模式(未启用严格勾选)下勾选父菜单会自动全选全部子菜单; // 提交前压缩为最小直接授权集:父级已勾选时后代不再重复提交(后端按“父级授权 - // 展开全部后代”判断权限,与旧 admin.html 勾父清后代语义一致)。 + // 展开全部后代”判断权限,与旧 admin.html 勾父清后代语义一致), + // 并剔除置灰的祖先分组(派生勾选,操作者无权授予)。 emit('update:checked', compactDirectGrantIds(ids, data.value)) } diff --git a/admin-frontend-vue/src/pages/account/user-menu-auth-api.ts b/admin-frontend-vue/src/pages/account/user-menu-auth-api.ts index c86cd2b73..a54bad6f6 100644 --- a/admin-frontend-vue/src/pages/account/user-menu-auth-api.ts +++ b/admin-frontend-vue/src/pages/account/user-menu-auth-api.ts @@ -15,11 +15,14 @@ import { export const GRANT_MENUS_ENDPOINT = '/api/admin/permission-menus' export const USER_PERMISSION_COLUMNS_ENDPOINT = '/api/admin/permission-users' -/** 拉取可授权菜单树(后台 admin + 前端客户端 app 两类合并,按 sort 排序)。 */ +/** + * 拉取可授权菜单树(后台 admin + 前端客户端 app 两类合并,按 sort 排序)。 + * grantableOnly:非超管只拿到自己已持有的菜单,范围外的项后端不再下发。 + */ export async function fetchGrantableMenus(): Promise { const [adminRes, appRes] = await Promise.all([ - http.get(GRANT_MENUS_ENDPOINT, { params: { menuType: ADMIN_MENU_TYPE } }), - http.get(GRANT_MENUS_ENDPOINT, { params: { menuType: APP_MENU_TYPE } }), + http.get(GRANT_MENUS_ENDPOINT, { params: { menuType: ADMIN_MENU_TYPE, grantableOnly: true } }), + http.get(GRANT_MENUS_ENDPOINT, { params: { menuType: APP_MENU_TYPE, grantableOnly: true } }), ]) const nodes = [ ...parseMenuOptionList(adminRes.data, ADMIN_MENU_TYPE), diff --git a/admin-frontend-vue/src/pages/account/user-menu-auth.ts b/admin-frontend-vue/src/pages/account/user-menu-auth.ts index 9942649dc..53924fc56 100644 --- a/admin-frontend-vue/src/pages/account/user-menu-auth.ts +++ b/admin-frontend-vue/src/pages/account/user-menu-auth.ts @@ -17,8 +17,8 @@ export interface MenuOptionNode { /** 所属菜单类型(admin 后台 / app 前端客户端),提交时按类型分区落库。 */ type: string /** - * 当前操作者无权授予(后端 grantable=false)时置灰:仍展示并回显已勾选, - * 但不允许改勾选。非超管只能授自己已有的菜单,勾到越权项会让整笔保存回滚。 + * 当前操作者无权授予(后端 grantable=false)时置灰。授权树对非超管只下发自己已有 + * 的菜单,因此这里剩下的只有「为保留层级而带上的祖先分组」:展示但不可勾,提交时剔除。 */ disabled?: boolean children?: MenuOptionNode[] @@ -118,6 +118,11 @@ export function buildUserColumnPermissionPayload(raw: unknown): { columnIds: num * 重复提交(后端读取/校验时父级授权会向全部后代展开,与旧 admin.html“勾父清 * 后代”语义一致,避免 user_column_permission 存储冗余行)。未勾选父级但单独 * 勾选子级的部分授权原样保留。 + * + *

置灰节点(disabled,即操作者无权授予、只为还原层级而带上的祖先分组)一律剔除, + * 且其勾选态不参与“父级覆盖后代”的判断:那是子节点联动派生出来的,不代表用户意图。 + * 提交它等于把整个分组授出去,会连带授予树上未下发(因此看不见)的后代菜单, + * 同时被后端 ensureGrantable 判越权、整单 403 回滚。 */ export function compactDirectGrantIds(checkedIds: unknown, tree: MenuOptionNode[]): number[] { const ids = normalizeMenuIds(checkedIds) @@ -125,16 +130,19 @@ export function compactDirectGrantIds(checkedIds: unknown, tree: MenuOptionNode[ const idSet = new Set(ids) /** 因“有已勾选祖先”而被父级覆盖、无需直接授权的 id。 */ const coveredByAncestor = new Set() + /** 操作者无权授予、不得出现在提交里的 id。 */ + const ungrantable = new Set() const walk = (nodes: MenuOptionNode[], ancestorChecked: boolean): void => { for (const node of nodes) { + if (node.disabled) ungrantable.add(node.id) if (ancestorChecked) { coveredByAncestor.add(node.id) if (node.children?.length) walk(node.children, true) continue } - if (node.children?.length) walk(node.children, idSet.has(node.id)) + if (node.children?.length) walk(node.children, !node.disabled && idSet.has(node.id)) } } walk(tree, false) - return ids.filter((id) => !coveredByAncestor.has(id)) + return ids.filter((id) => !ungrantable.has(id) && !coveredByAncestor.has(id)) } diff --git a/admin-frontend-vue/tests/align-user-menu-grantable.test.ts b/admin-frontend-vue/tests/align-user-menu-grantable.test.ts index 73e17f503..3623c27b5 100644 --- a/admin-frontend-vue/tests/align-user-menu-grantable.test.ts +++ b/admin-frontend-vue/tests/align-user-menu-grantable.test.ts @@ -11,10 +11,14 @@ import { // 2026-09-16 线上事故:非超管(普通管理员)在授权树里勾到自己无权授予的菜单后, // 后端 ensureGrantable 抛 403 并回滚整笔事务——创建用户与保存权限双双失败, // 前端只显示「普通管理员只能分配自己已有的菜单权限」。 -// 修复:菜单列表按操作者标记 grantable,前端把不可授予的节点置灰不可勾。 // -// 注意:这里是「置灰」而非「隐藏」。授权保存是整树替换,隐藏会让超管早先授予、 -// 而操作者自己没有的菜单在提交时被当作取消勾选删掉(与 09-13「权限自己没掉」同类)。 +// 现在的口径:非超管的授权树**只下发**自己已持有的菜单(读接口按操作者过滤), +// 范围外的项连展示都没有。为保留「一级分组 + 子页面」层级,可授予项的祖先分组仍 +// 下发但标 grantable=false 置灰——分组自身不在范围内,一旦可勾,「勾父覆盖全部后代」 +// 就会把树上未展示的范围外菜单一起授出去,所以 onCheck 必须剔除置灰节点。 +// +// 隐藏不会重现 09-13「权限自己没掉」:保存侧的整树替换范围跟着收窄到操作者可授予 +// 集合,范围外的既有授权(超管直接分配给该员工的)不会被这次保存删掉。 test('align_user_menu_grantable_false_maps_to_disabled_node', () => { const locked = parsePermissionMenuItem( @@ -50,24 +54,44 @@ test('align_user_menu_grantable_survives_tree_build', () => { assert.equal(tree.find((node) => node.id === 100)?.disabled, false, '可授予节点不受影响') }) -test('align_user_menu_grantable_disabled_node_still_compactable', () => { - // 已持有但无权授予的节点会保持勾选并原样提交,压缩逻辑不能因 disabled 漏掉它 +test('align_user_menu_grantable_disabled_ancestor_is_never_submitted', () => { + // 置灰分组(操作者无权授予、只为层级而下发)的勾选态由子节点联动派生, + // 提交它等于授予整个分组、连带树上未展示的后代,必须剔除且子项各自保留。 const tree = buildMenuOptionTree( parseMenuOptionList( [ { id: 98, name: '账号与权限', parent_id: null, sort_order: 1, grantable: false }, - { id: 7, name: '用户管理', parent_id: 98, sort_order: 1, grantable: false }, + { id: 7, name: '用户管理', parent_id: 98, sort_order: 1, grantable: true }, + { id: 8, name: '分组管理', parent_id: 98, sort_order: 2, grantable: true }, ], 'admin', ), ) - assert.deepEqual(compactDirectGrantIds([98, 7], tree), [98], '父级已勾选时仍压缩掉后代') + assert.deepEqual(compactDirectGrantIds([98, 7, 8], tree), [7, 8], '剔除派生勾选的分组,子项不被它覆盖') +}) + +test('align_user_menu_grantable_grantable_parent_still_covers_children', () => { + // 对照组:操作者确实持有该分组时,勾父仍然压缩掉全部后代。 + const tree = buildMenuOptionTree( + parseMenuOptionList( + [ + { id: 98, name: '账号与权限', parent_id: null, sort_order: 1, grantable: true }, + { id: 7, name: '用户管理', parent_id: 98, sort_order: 1, grantable: true }, + ], + 'admin', + ), + ) + assert.deepEqual(compactDirectGrantIds([98, 7], tree), [98], '可授予父级已勾选时压缩掉后代') }) test('align_user_menu_grantable_wired_end_to_end', () => { const tree = readSource('src/pages/account/UserMenuAuthTree.vue') assert.match(tree, /disabled: 'disabled'/, 'el-tree 按 disabled 键置灰节点') + const api = readSource('src/pages/account/user-menu-auth-api.ts') + assert.match(api, /menuType: ADMIN_MENU_TYPE, grantableOnly: true/, '后台树按授权语义请求') + assert.match(api, /menuType: APP_MENU_TYPE, grantableOnly: true/, '客户端树按授权语义请求') + const vo = readSource( '../backend-java/src/main/java/com/nanri/aiimage/modules/permission/model/vo/PermissionMenuItemVo.java', ) @@ -76,11 +100,17 @@ test('align_user_menu_grantable_wired_end_to_end', () => { const controller = readSource( '../backend-java/src/main/java/com/nanri/aiimage/modules/permission/controller/PermissionMenuController.java', ) - assert.match(controller, /permissionMenuService\.list\(requireAdmin\(request\), menuType\)/, '列表接口传入操作者') + assert.match( + controller, + /permissionMenuService\.list\(requireAdmin\(request\), menuType, grantableOnly\)/, + '列表接口传入操作者与授权树开关', + ) const service = readSource( '../backend-java/src/main/java/com/nanri/aiimage/modules/permission/service/PermissionMenuService.java', ) + assert.match(service, /includeAncestorIds\(grantableIds, menus\)/, '过滤后仍补齐祖先分组') assert.match(service, /resolveGrantableMenuIds/, '按操作者计算可授予集') - assert.match(service, /ensureGrantable\(operator, grantIds, userId\)/, '保存校验传入目标用户以放行既有授权') + assert.match(service, /ensureGrantable\(operator, grantIds, userId, grantableIds\)/, '保存校验传入目标用户以放行既有授权') + assert.match(service, /Set deleteScope = normalizedType == null \? null : scopedMenuIds;/, '删除范围跟随操作者可授予集') }) diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/permission/controller/PermissionMenuController.java b/backend-java/src/main/java/com/nanri/aiimage/modules/permission/controller/PermissionMenuController.java index 1a028595d..6539d6b86 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/permission/controller/PermissionMenuController.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/permission/controller/PermissionMenuController.java @@ -55,9 +55,11 @@ public class PermissionMenuController { @GetMapping("/permission-menus") @Operation(summary = "查询菜单权限列表") public ApiResponse> listMenus(HttpServletRequest request, - @Parameter(description = "菜单类型: app/admin") @RequestParam(required = false) String menuType) { - // 传入操作者:授权树据此把「非超管无权授予」的菜单标记为不可勾选 - return ApiResponse.success(permissionMenuService.list(requireAdmin(request), menuType)); + @Parameter(description = "菜单类型: app/admin") @RequestParam(required = false) String menuType, + @Parameter(description = "授权树语义: true 时非超管只返回自己可授予的菜单") + @RequestParam(required = false, defaultValue = "false") boolean grantableOnly) { + // 传入操作者:授权树据此只下发(并把范围外节点标成不可勾选)操作者有权授予的菜单 + return ApiResponse.success(permissionMenuService.list(requireAdmin(request), menuType, grantableOnly)); } @PostMapping("/permission-menus") diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/permission/service/PermissionMenuService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/permission/service/PermissionMenuService.java index ab90273b3..8a2dc1518 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/permission/service/PermissionMenuService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/permission/service/PermissionMenuService.java @@ -57,19 +57,34 @@ public class PermissionMenuService { /** Returns the flat menu catalog, including each item's direct parent ID. */ public List list(String menuType) { - return list(null, menuType); + return list(null, menuType, false); + } + + /** 菜单目录(菜单权限配置页):全量下发,只按操作者标记 grantable。 */ + public List list(AdminUserEntity operator, String menuType) { + return list(operator, menuType, false); } /** - * 授权树用:非超管只能授予自己已持有的菜单(与 {@link #ensureGrantable} 同一判据), - * 这里把结论标进 {@code grantable},让前端把不可授予的节点置灰,避免「勾了才在保存时 - * 整单被 403 回滚」——创建用户与保存权限共用这一棵树,勾到一个越权项会连建号一起失败。 - * operator 为空或超管时不限制。 + * @param grantableOnly 授权树语义:非超管只返回自己已持有的菜单,范围外的项不再下发 + * (判据与 {@link #ensureGrantable} 同一套 {@link #resolveGrantableMenuIds})。 + * 为了让树上仍保留「一级分组 + 子页面」层级,可授予项的祖先分组一并返回, + * 但标成 {@code grantable=false} 让前端置灰——分组自身不在操作者范围内, + * 一旦可勾,「勾父覆盖全部后代」就会把树上未展示的范围外菜单一起授出去。 + * 保存侧必须配套按操作者范围替换,见 + * {@link #updateUserColumnPermissions(AdminUserEntity, Long, UserColumnPermissionUpdateRequest, String, boolean)}。 */ - public List list(AdminUserEntity operator, String menuType) { + public List list(AdminUserEntity operator, String menuType, boolean grantableOnly) { List menus = loadMenus(menuType); - List items = toItemVos(menus, menus); Set grantableIds = resolveGrantableMenuIds(operator); + List visibleMenus = menus; + if (grantableOnly && grantableIds != null) { + Set visibleIds = includeAncestorIds(grantableIds, menus); + visibleMenus = menus.stream() + .filter(menu -> menu.getId() != null && visibleIds.contains(menu.getId())) + .toList(); + } + List items = toItemVos(visibleMenus, menus); for (PermissionMenuItemVo item : items) { item.setGrantable(grantableIds == null || grantableIds.contains(item.getId())); } @@ -497,7 +512,7 @@ public class PermissionMenuService { /** * Replaces direct grants. A non-super admin may only grant effective menus * that the operator already has, and only to themself or a directly-created - * normal user. + * normal user. Grants outside the operator's set are left untouched. */ @Transactional public void updateUserColumnPermissions(AdminUserEntity operator, @@ -506,7 +521,10 @@ public class PermissionMenuService { updateUserColumnPermissions(operator, userId, request, null); } - /** Replaces direct grants only within menuType; a blank type keeps legacy full-replacement behavior. */ + /** + * Replaces direct grants only within menuType; a blank type replaces every type. + * For a non-super admin both cases narrow to the operator's grantable set. + */ @Transactional public void updateUserColumnPermissions(AdminUserEntity operator, Long userId, @@ -533,6 +551,7 @@ public class PermissionMenuService { String normalizedType = menuType == null || menuType.isBlank() ? null : normalizeMenuTypeRequired(menuType); + Set grantableIds = resolveGrantableMenuIds(operator); Set scopedMenuIds = new LinkedHashSet<>(); if (normalizedType == null) { if (!requestedIds.isEmpty()) { @@ -570,7 +589,7 @@ public class PermissionMenuService { .filter(id -> !protectedIds.contains(id)) .toList(); } - ensureGrantable(operator, grantIds, userId); + ensureGrantable(operator, grantIds, userId, grantableIds); LinkedHashSet finalGrantIds = new LinkedHashSet<>(grantIds); if (!protectedIds.isEmpty()) { @@ -582,10 +601,23 @@ public class PermissionMenuService { } } - if (normalizedType == null) { + // 「整树替换」的替换范围要跟着授权树的可见范围收窄:非超管的授权树已不再下发 + // 自己范围外的菜单(见 list(operator, menuType, true)),这些既有授权(通常由超管 + // 直接分配)不会出现在提交里,按全类型删除等于把它们静默清掉——与 09-13 + // 「权限自己没掉」、09-16「整单 403」是同一类事故。范围外项保持原样, + // 既不会被本次保存删除,也不会被新增(新增越权仍由 ensureGrantable 拒绝)。 + Set deleteScope = normalizedType == null ? null : scopedMenuIds; + if (grantableIds != null) { + deleteScope = deleteScope == null + ? new LinkedHashSet<>(grantableIds) + : deleteScope.stream() + .filter(grantableIds::contains) + .collect(Collectors.toCollection(LinkedHashSet::new)); + } + if (deleteScope == null) { userColumnPermissionMapper.deleteByUserId(userId); - } else if (!scopedMenuIds.isEmpty()) { - userColumnPermissionMapper.deleteByUserIdAndColumnIds(userId, new ArrayList<>(scopedMenuIds)); + } else if (!deleteScope.isEmpty()) { + userColumnPermissionMapper.deleteByUserIdAndColumnIds(userId, new ArrayList<>(deleteScope)); } for (Long columnId : finalGrantIds) { UserColumnPermissionEntity entity = new UserColumnPermissionEntity(); @@ -867,13 +899,16 @@ public class PermissionMenuService { * 编辑该用户时整树提交会把它原样带回,若一并判为越权,整笔事务会回滚——连建号、改密 * 都做不成(生产 2026-09-16 现象:勾到一个越权项,创建用户与保存权限双双失败)。 * 只放行「保留已有」不放行「新增」,因此不构成提权。 + * + * @param grantableIds 调用方算好的操作者可授予全集,null 表示不限制 */ - private void ensureGrantable(AdminUserEntity operator, List requestedIds, Long targetUserId) { + private void ensureGrantable(AdminUserEntity operator, List requestedIds, Long targetUserId, + Set grantableIds) { if (operator == null || isSuperAdmin(operator)) { return; } // 操作者自身 id 缺失(异常数据)时按「无任何可授予项」从严处理,不放行 - Set effective = Objects.requireNonNullElse(resolveGrantableMenuIds(operator), Set.of()); + Set effective = Objects.requireNonNullElse(grantableIds, Set.of()); Set keptIds = targetUserId == null ? Set.of() : new LinkedHashSet<>(loadDirectColumnIds(targetUserId)); diff --git a/backend-java/src/test/java/com/nanri/aiimage/modules/permission/controller/PermissionMenuControllerTest.java b/backend-java/src/test/java/com/nanri/aiimage/modules/permission/controller/PermissionMenuControllerTest.java index cd5100a2e..302795940 100644 --- a/backend-java/src/test/java/com/nanri/aiimage/modules/permission/controller/PermissionMenuControllerTest.java +++ b/backend-java/src/test/java/com/nanri/aiimage/modules/permission/controller/PermissionMenuControllerTest.java @@ -126,12 +126,12 @@ class PermissionMenuControllerTest { when(request.getHeader("X-Internal-Token")).thenReturn("shared-token"); when(request.getParameter("operatorId")).thenReturn("12"); when(service.requireAdminOperator(12L)).thenReturn(operator); - when(service.list(operator, "app")).thenReturn(List.of()); + when(service.list(operator, "app", false)).thenReturn(List.of()); - controller.listMenus(request, "app"); + controller.listMenus(request, "app", false); verify(service).requireAdminOperator(12L); - verify(service).list(operator, "app"); + verify(service).list(operator, "app", false); verify(request, never()).getParameter("superAdmin"); } @@ -147,10 +147,10 @@ class PermissionMenuControllerTest { when(authSupport.requireAdmin(request)).thenThrow(authFailure); when(request.getHeader("X-Internal-Token")).thenReturn("wrong-token"); - assertThatThrownBy(() -> controller.listMenus(request, "app")) + assertThatThrownBy(() -> controller.listMenus(request, "app", false)) .isSameAs(authFailure); verify(service, never()).requireAdminOperator(anyLong()); - verify(service, never()).list(any(AdminUserEntity.class), eq("app")); + verify(service, never()).list(any(AdminUserEntity.class), eq("app"), eq(false)); } @Test @@ -171,12 +171,12 @@ class PermissionMenuControllerTest { when(request.getHeader("X-Internal-Token")).thenReturn("file-token"); when(request.getParameter("operatorId")).thenReturn("12"); when(service.requireAdminOperator(12L)).thenReturn(operator); - when(service.list(operator, "admin")).thenReturn(List.of()); + when(service.list(operator, "admin", false)).thenReturn(List.of()); - controller.listMenus(request, "admin"); + controller.listMenus(request, "admin", false); verify(service).requireAdminOperator(12L); - verify(service).list(operator, "admin"); + verify(service).list(operator, "admin", false); } @Test @@ -194,7 +194,7 @@ class PermissionMenuControllerTest { when(request.getRemoteAddr()).thenReturn("127.0.0.1"); when(request.getParameter("operatorId")).thenReturn("12"); - assertThatThrownBy(() -> controller.listMenus(request, "admin")) + assertThatThrownBy(() -> controller.listMenus(request, "admin", false)) .isSameAs(authFailure); verify(service, never()).requireAdminOperator(anyLong()); verify(service, never()).list("admin"); @@ -216,7 +216,7 @@ class PermissionMenuControllerTest { when(request.getHeader("X-Internal-Token")).thenReturn("file-token"); when(request.getParameter("operatorId")).thenReturn("12"); - assertThatThrownBy(() -> controller.listMenus(request, "admin")) + assertThatThrownBy(() -> controller.listMenus(request, "admin", false)) .isSameAs(authFailure); verify(service, never()).requireAdminOperator(anyLong()); verify(service, never()).list("admin"); 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 a481672ff..cccab71b7 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 @@ -27,6 +27,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.assertj.core.api.Assertions.tuple; import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.argThat; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; @@ -472,9 +473,12 @@ class PermissionMenuServiceTest { } @Test - void ordinaryAdminReplacementRemovesDirectGrantsOutsideOwnEffectiveScope() { - // 管理员权限被回收后,其名下员工超出管理员范围的直接授权必须一并移除, - // 否则回收了管理员的菜单权限,员工权限却还在(也永远删不掉)。 + void nonSuperAdminSaveLeavesGrantsOutsideOwnScopeUntouched() { + // 授权树对非超管只下发自己可授予的菜单(list(..., true)),范围外的既有授权 + // (由超管直接分配给该员工)不会出现在提交里。整树替换的范围必须跟着收窄, + // 否则一次保存就把它们静默清掉——与 09-13「权限自己没掉」同类。 + // 回收路径不受影响:超管回收管理员的菜单时由 cascadeCleanupSubordinateOverreach + // 清掉其名下员工的越权项,见 adminPermissionRevocationCascadesToCreatedSubordinates。 PermissionMenuMapper menuMapper = mock(PermissionMenuMapper.class); UserColumnPermissionMapper permissionMapper = mock(UserColumnPermissionMapper.class); AdminUserMapper userMapper = mock(AdminUserMapper.class); @@ -502,6 +506,37 @@ class PermissionMenuServiceTest { assertThat(inserted.getAllValues()) .extracting(UserColumnPermissionEntity::getColumnId) .containsExactly(1L); + // 只删自己范围内的项(1),员工超管的既有授权 2 原样保留 + verify(permissionMapper).deleteByUserIdAndColumnIds(20L, List.of(1L)); + verify(permissionMapper, never()).deleteByUserId(any()); + verify(permissionMapper, never()).deleteByUserIdAndColumnIds(eq(20L), argThat(ids -> ids.contains(2L))); + } + + @Test + void superAdminSaveStillReplacesWholePartition() { + // 超管不受范围收窄影响:未提交的授权按整树替换语义移除。 + PermissionMenuMapper menuMapper = mock(PermissionMenuMapper.class); + UserColumnPermissionMapper permissionMapper = mock(UserColumnPermissionMapper.class); + AdminUserMapper userMapper = mock(AdminUserMapper.class); + PermissionMenuService service = new PermissionMenuService(menuMapper, permissionMapper, userMapper); + + AdminUserEntity operator = user(1L, "super_admin", 1); + AdminUserEntity target = user(20L, "normal", 0); + target.setCreatedById(10L); + when(userMapper.selectById(20L)).thenReturn(target); + when(menuMapper.selectCount(any())).thenReturn(1L); + when(menuMapper.selectOne(any())).thenReturn(null); + when(menuMapper.selectList(any())).thenReturn(List.of( + menu(1L, null, "app", 1), + menu(2L, null, "app", 2))); + when(permissionMapper.selectByUserId(any())).thenReturn(List.of(grant(20L, 2L))); + UserColumnPermissionUpdateRequest request = new UserColumnPermissionUpdateRequest(); + request.setColumnIds(List.of(1L)); + + service.updateUserColumnPermissions(operator, 20L, request); + + verify(permissionMapper).deleteByUserId(20L); + verify(permissionMapper, never()).deleteByUserIdAndColumnIds(any(), any()); } @Test @@ -1209,6 +1244,47 @@ class PermissionMenuServiceTest { verify(permissionMapper, never()).selectByUserId(any()); } + /** + * 授权树语义(grantableOnly=true):范围外的菜单根本不下发,只保留可授予项以及 + * 为还原层级带上的祖先分组,分组自身标 grantable=false 让前端置灰不可勾。 + */ + @Test + void listGrantableOnlyHidesMenusOutsideOperatorSetButKeepsDisabledAncestors() { + PermissionMenuMapper menuMapper = mock(PermissionMenuMapper.class); + UserColumnPermissionMapper permissionMapper = mock(UserColumnPermissionMapper.class); + AdminUserMapper userMapper = mock(AdminUserMapper.class); + PermissionMenuService service = new PermissionMenuService(menuMapper, permissionMapper, userMapper); + when(menuMapper.selectList(any())).thenReturn(List.of( + menu(1L, null, "admin", 1), // 一级分组:操作者并未持有,只是 2 的父级 + menu(2L, 1L, "admin", 2), // 操作者持有的子菜单 + menu(3L, null, "admin", 3), // 范围外 + menu(4L, 3L, "admin", 4))); // 范围外分组的子菜单 + when(permissionMapper.selectByUserId(30L)).thenReturn(List.of(grant(30L, 2L))); + + List items = service.list(user(30L, "admin", 1), "admin", true); + + assertThat(items) + .extracting(PermissionMenuItemVo::getId, PermissionMenuItemVo::getGrantable) + .containsExactlyInAnyOrder(tuple(1L, false), tuple(2L, true)); + } + + /** 超管的授权树不受过滤影响,仍拿到全量目录且全部可授予。 */ + @Test + void listGrantableOnlyKeepsFullCatalogForSuperAdmin() { + PermissionMenuMapper menuMapper = mock(PermissionMenuMapper.class); + UserColumnPermissionMapper permissionMapper = mock(UserColumnPermissionMapper.class); + AdminUserMapper userMapper = mock(AdminUserMapper.class); + PermissionMenuService service = new PermissionMenuService(menuMapper, permissionMapper, userMapper); + when(menuMapper.selectList(any())).thenReturn(List.of( + menu(1L, null, "admin", 1), + menu(3L, null, "admin", 3))); + + List items = service.list(user(31L, "super_admin", 1), "admin", true); + + assertThat(items).extracting(PermissionMenuItemVo::getId).containsExactly(1L, 3L); + assertThat(items).extracting(PermissionMenuItemVo::getGrantable).containsOnly(true); + } + /** * 目标用户已持有的授权(通常由超管分配)不参与「只能授自己已有的」校验: * 普通管理员编辑该用户时整树提交会把它原样带回,若一并判为越权,整笔事务回滚,