fix(权限): 用户菜单权限“自己没掉”——分区落库时级联清理跨类型误删 + 编辑弹窗空授权提交
- 级联清理的有效集改为按目标「完整直接授权」计算(读库,含 admin/app 全类型)。 此前 admin/app 分区落库把本次提交的 id 当成完整有效集,员工持有的另一类型授权 会整体被判越权删除;两次分区落库互相补刀,最终清空员工全部菜单权限 (生产表现:保存某非超管的权限后,他直建员工的菜单隔三差五自己消失) - AdminUserService 改为两类落库完成后再统一级联一次,新增 cascadeSubordinateOverreach 入口 - 后台「编辑用户」弹窗:授权未加载完成/失败时禁用保存并明确提示, 避免以空 columnIds 整树清空该用户授权(改动密码等操作也会连带触发) - 回归测试:deferredCascadeKeepsSubordinateGrantsOfOtherMenuType、 perTypeReplacementDoesNotCascadeBeforeAllTypesWritten、edit_user_dialog_blocks_save_until_auth_loaded 已知既有红测试(与本次改动无关,干净 HEAD 上同样复现,未新增): ArchitectureBoundaryTest.taskToBusinessDependencyDoesNotGrow(110 > 基线 84)、 HttpClientTimeoutEffectiveTest.connectTimeoutFiresOnUnreachableHost(本机网络环境 60s)
This commit is contained in:
+9
-4
@@ -20,6 +20,7 @@ import static org.mockito.ArgumentMatchers.any;
|
||||
import static org.mockito.ArgumentMatchers.eq;
|
||||
import static org.mockito.Mockito.mock;
|
||||
import static org.mockito.Mockito.never;
|
||||
import static org.mockito.Mockito.times;
|
||||
import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
@@ -58,9 +59,11 @@ class AdminUserServiceTest {
|
||||
ArgumentCaptor<UserColumnPermissionUpdateRequest> appReq =
|
||||
ArgumentCaptor.forClass(UserColumnPermissionUpdateRequest.class);
|
||||
verify(permissionService).updateUserColumnPermissions(
|
||||
eq(operator), eq(20L), adminReq.capture(), eq(PermissionMenuService.MENU_TYPE_ADMIN));
|
||||
eq(operator), eq(20L), adminReq.capture(), eq(PermissionMenuService.MENU_TYPE_ADMIN), eq(false));
|
||||
verify(permissionService).updateUserColumnPermissions(
|
||||
eq(operator), eq(20L), appReq.capture(), eq(PermissionMenuService.MENU_TYPE_APP));
|
||||
eq(operator), eq(20L), appReq.capture(), eq(PermissionMenuService.MENU_TYPE_APP), eq(false));
|
||||
// 两类落库完成后只级联清理一次,避免用不完整有效集误删员工另一类型授权
|
||||
verify(permissionService, times(1)).cascadeSubordinateOverreach(20L);
|
||||
assertThat(adminReq.getValue().getColumnIds()).containsExactly(11L);
|
||||
assertThat(appReq.getValue().getColumnIds()).containsExactly(12L);
|
||||
assertThat(AdminUserService.class
|
||||
@@ -95,9 +98,11 @@ class AdminUserServiceTest {
|
||||
ArgumentCaptor<UserColumnPermissionUpdateRequest> appReq =
|
||||
ArgumentCaptor.forClass(UserColumnPermissionUpdateRequest.class);
|
||||
verify(permissionService).updateUserColumnPermissions(
|
||||
eq(operator), eq(20L), adminReq.capture(), eq(PermissionMenuService.MENU_TYPE_ADMIN));
|
||||
eq(operator), eq(20L), adminReq.capture(), eq(PermissionMenuService.MENU_TYPE_ADMIN), eq(false));
|
||||
verify(permissionService).updateUserColumnPermissions(
|
||||
eq(operator), eq(20L), appReq.capture(), eq(PermissionMenuService.MENU_TYPE_APP));
|
||||
eq(operator), eq(20L), appReq.capture(), eq(PermissionMenuService.MENU_TYPE_APP), eq(false));
|
||||
// 两类落库完成后只级联清理一次,避免用不完整有效集误删员工另一类型授权
|
||||
verify(permissionService, times(1)).cascadeSubordinateOverreach(20L);
|
||||
assertThat(adminReq.getValue().getColumnIds()).isEmpty();
|
||||
assertThat(appReq.getValue().getColumnIds()).containsExactly(21L);
|
||||
assertThat(AdminUserService.class
|
||||
|
||||
Reference in New Issue
Block a user