收口(去重库读侧): 按行 company_id 认公司——代导入/上传者已删两族归位
控制方 2026-10-09 截图:admin 在「先锋」tab 代导入的行(company_id=3、 uploader=admin 属公司 1)在先锋 tab 看不见、反而出现在米椿花 tab。读侧 (列表/导出/公司超管)自 V145 起一直按"上传账号"认公司,与写侧(5ccf3c89 起一律显式落 company_id、V154 已摘 DEFAULT)两套口径打架;切换前先把存量 兜底行修对:V156 把组 33/uid=1188(「先锋」,账号已硬删)的 1452 行 company_id 1→3——否则切完它们整批冒给米椿花,且当前正参与米椿花的去重 比对(5ccf3c89 已按 company_id 收窄),先锋自己反而拿不到这批值。 - DataReadScope 新增第五道正门 superAdminScopedCompanyId:与 superAdminScopedUserIds 同形"只对站点超管收窄",维度从上传账号集换成 行 company_id;非超管恒 null(不叠那一刀,可见集仍锁在账号/分组上) - Service applyCompanyScope 由 uploader_user_id IN (成员) 改 eq(company_id); company_super_admin 的 wholeCompany 分支同批切换(1206 从此看得到代导入 行与上传者已删行,例:admin 代导入 14 行 + 组 33 历史 1452 行) - G2 护栏加第五道门 + 正/负三枚探针;单测新增四条(超管切公司、公司超管 全公司、门非超管恒 null、service 层 wrapper 两面) DedupeTotalDataController 的换门接线已随 2a4d15b8(文案批)入库。 影响面(生产只读实查):切后米椿花 tab −14 行、先锋 tab +14+1452 行; 公司超管仅 1206 一个账号。全量 4209 测绿。
This commit is contained in:
+19
-14
@@ -3,7 +3,6 @@ package com.nanri.aiimage.modules.dedupe.controller;
|
||||
import com.nanri.aiimage.common.exception.BusinessException;
|
||||
import com.nanri.aiimage.common.security.AdminAuthSupport;
|
||||
import com.nanri.aiimage.common.service.DataReadScope;
|
||||
import com.nanri.aiimage.common.service.ReadScope;
|
||||
import com.nanri.aiimage.modules.dedupe.service.DedupeTotalDataService;
|
||||
import com.nanri.aiimage.common.model.entity.AdminUserEntity;
|
||||
import com.nanri.aiimage.modules.permission.service.PermissionMenuService;
|
||||
@@ -46,12 +45,13 @@ class DedupeTotalDataControllerTest {
|
||||
HttpServletRequest request = mock(HttpServletRequest.class);
|
||||
DedupeTotalDataController controller = new DedupeTotalDataController(
|
||||
service, authSupport, permissionMenuService, dataReadScope);
|
||||
when(dataReadScope.readScope(any(), any())).thenReturn(ReadScope.unfiltered());
|
||||
AdminUserEntity operator = new AdminUserEntity();
|
||||
operator.setId(8L);
|
||||
operator.setRole("super_admin");
|
||||
when(authSupport.requireUser(request)).thenReturn(operator);
|
||||
when(authSupport.currentRole(operator)).thenReturn("super_admin");
|
||||
// 未选公司 ⇒ 门给 null(Mockito 对包装 Long 的默认返回值是 0L,必须显式桩)
|
||||
when(dataReadScope.superAdminScopedCompanyId(any(), any())).thenReturn(null);
|
||||
doAnswer(invocation -> {
|
||||
OutputStream outputStream = invocation.getArgument(0);
|
||||
outputStream.write(new byte[]{1, 2, 3});
|
||||
@@ -111,12 +111,13 @@ class DedupeTotalDataControllerTest {
|
||||
HttpServletRequest request = mock(HttpServletRequest.class);
|
||||
DedupeTotalDataController controller = new DedupeTotalDataController(
|
||||
service, authSupport, permissionMenuService, dataReadScope);
|
||||
when(dataReadScope.readScope(any(), any())).thenReturn(ReadScope.unfiltered());
|
||||
AdminUserEntity operator = new AdminUserEntity();
|
||||
operator.setId(8L);
|
||||
operator.setRole("super_admin");
|
||||
when(authSupport.requireUser(request)).thenReturn(operator);
|
||||
when(authSupport.currentRole(operator)).thenReturn("super_admin");
|
||||
// 未选公司 ⇒ 门给 null(Mockito 对包装 Long 的默认返回值是 0L,必须显式桩)
|
||||
when(dataReadScope.superAdminScopedCompanyId(any(), any())).thenReturn(null);
|
||||
|
||||
ResponseEntity<StreamingResponseBody> response = controller.export(
|
||||
"member",
|
||||
@@ -157,12 +158,13 @@ class DedupeTotalDataControllerTest {
|
||||
HttpServletRequest request = mock(HttpServletRequest.class);
|
||||
DedupeTotalDataController controller = new DedupeTotalDataController(
|
||||
service, authSupport, permissionMenuService, dataReadScope);
|
||||
when(dataReadScope.readScope(any(), any())).thenReturn(ReadScope.unfiltered());
|
||||
AdminUserEntity operator = new AdminUserEntity();
|
||||
operator.setId(8L);
|
||||
operator.setRole("super_admin");
|
||||
when(authSupport.requireUser(request)).thenReturn(operator);
|
||||
when(authSupport.currentRole(operator)).thenReturn("super_admin");
|
||||
// 未选公司 ⇒ 门给 null(Mockito 对包装 Long 的默认返回值是 0L,必须显式桩)
|
||||
when(dataReadScope.superAdminScopedCompanyId(any(), any())).thenReturn(null);
|
||||
doAnswer(invocation -> {
|
||||
OutputStream outputStream = invocation.getArgument(0);
|
||||
outputStream.write(new byte[]{4, 5});
|
||||
@@ -215,7 +217,6 @@ class DedupeTotalDataControllerTest {
|
||||
HttpServletRequest request = mock(HttpServletRequest.class);
|
||||
DedupeTotalDataController controller = new DedupeTotalDataController(
|
||||
service, authSupport, permissionMenuService, dataReadScope);
|
||||
when(dataReadScope.readScope(any(), any())).thenReturn(ReadScope.unfiltered());
|
||||
|
||||
BusinessException exception = assertThrows(BusinessException.class, () -> controller.export(
|
||||
"member",
|
||||
@@ -231,9 +232,10 @@ class DedupeTotalDataControllerTest {
|
||||
}
|
||||
|
||||
@Test
|
||||
void companyTabNarrowsSuperAdminToListOfMemberAccounts() {
|
||||
// 超管点公司 tab ⇒ 成员集必须一路传到 service 的最后一个实参。
|
||||
// 这一记盯的是"参数收了、readScope 也调了、结果却喂了 null"那种假接线(tab 恒不动的现网形状)。
|
||||
void companyTabNarrowsSuperAdminToRequestedCompanyId() {
|
||||
// 超管点公司 tab ⇒ 门给出的公司 id 必须一路传到 service 的最后一个实参。
|
||||
// 这一记盯的是"参数收了、门也调了、结果却喂了 null"那种假接线(tab 恒不动的现网形状)。
|
||||
// 2026-10-09 口径切换:尾参从"成员账号集"换成"公司 id"(行按 company_id 列筛)。
|
||||
DedupeTotalDataService service = mock(DedupeTotalDataService.class);
|
||||
AdminAuthSupport authSupport = mock(AdminAuthSupport.class);
|
||||
PermissionMenuService permissionMenuService = mock(PermissionMenuService.class);
|
||||
@@ -246,19 +248,19 @@ class DedupeTotalDataControllerTest {
|
||||
operator.setRole("super_admin");
|
||||
when(authSupport.requireUser(request)).thenReturn(operator);
|
||||
when(authSupport.currentRole(operator)).thenReturn("super_admin");
|
||||
when(dataReadScope.readScope(operator, 2L)).thenReturn(ReadScope.users(List.of(11L, 12L)));
|
||||
when(dataReadScope.superAdminScopedCompanyId(operator, 2L)).thenReturn(2L);
|
||||
|
||||
controller.page(1L, 15L, null, "member", null, null, null, null, null, 2L, request);
|
||||
|
||||
verify(service).page(eq(1L), eq(15L), isNull(), eq("member"),
|
||||
isNull(), isNull(), isNull(), isNull(), isNull(), eq(8L), eq(List.of(11L, 12L)));
|
||||
isNull(), isNull(), isNull(), isNull(), isNull(), eq(8L), eq(2L));
|
||||
}
|
||||
|
||||
@Test
|
||||
void nonSuperAdminStaysUnfilteredEvenWhenCompanyTabIsSent() {
|
||||
// 非超管:刻意<b>不</b>按公司收窄。他的可见集里含"靠分组权限可见"的行,
|
||||
// 叠一层账号 IN 会把那批行静默删掉(口径同 ShopManageController)。
|
||||
// 这条是反向钉:哪天有人给非超管也加上成员集,这里必须红。
|
||||
// 非超管:刻意<b>不</b>按公司收窄(门对非超管恒返回 null,规则在 DataReadScope 内)。
|
||||
// 他的可见集里含"靠分组权限可见"的行,叠一层公司谓词会把那批行静默删掉
|
||||
// (口径同 ShopManageController)。这条是反向钉:哪天有人给非超管也加上公司值,这里必须红。
|
||||
DedupeTotalDataService service = mock(DedupeTotalDataService.class);
|
||||
AdminAuthSupport authSupport = mock(AdminAuthSupport.class);
|
||||
PermissionMenuService permissionMenuService = mock(PermissionMenuService.class);
|
||||
@@ -274,11 +276,14 @@ class DedupeTotalDataControllerTest {
|
||||
PermissionMenuItemVo granted = new PermissionMenuItemVo();
|
||||
granted.setColumnKey("admin_dedupe_total_data");
|
||||
when(permissionMenuService.getUserColumnPermissions(9L, "admin")).thenReturn(List.of(granted));
|
||||
// 门对非超管恒返回 null(此处用桩复现该语义;Mockito 对包装 Long 的默认值是 0L)
|
||||
when(dataReadScope.superAdminScopedCompanyId(operator, 2L)).thenReturn(null);
|
||||
|
||||
controller.page(1L, 15L, null, null, null, null, null, null, null, 2L, request);
|
||||
|
||||
// 门被调(tab 值确实交给了唯一出口),但非超管由门内规则折成 null ⇒ service 不叠公司条件
|
||||
verify(dataReadScope).superAdminScopedCompanyId(operator, 2L);
|
||||
verify(service).page(eq(1L), eq(15L), isNull(), isNull(),
|
||||
isNull(), isNull(), isNull(), isNull(), isNull(), eq(9L), isNull());
|
||||
verify(dataReadScope, never()).readScope(any(), any());
|
||||
}
|
||||
}
|
||||
|
||||
+42
@@ -1,5 +1,8 @@
|
||||
package com.nanri.aiimage.modules.dedupe.service;
|
||||
|
||||
import com.baomidou.mybatisplus.core.MybatisConfiguration;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.TableInfoHelper;
|
||||
import com.nanri.aiimage.common.exception.BusinessException;
|
||||
import com.nanri.aiimage.common.mapper.AdminUserMapper;
|
||||
import com.nanri.aiimage.common.mapper.ShopManageGroupMapper;
|
||||
@@ -7,10 +10,13 @@ import com.nanri.aiimage.common.model.entity.AdminUserEntity;
|
||||
import com.nanri.aiimage.common.model.entity.ShopManageGroupEntity;
|
||||
import com.nanri.aiimage.common.service.CompanyScopeSupport;
|
||||
import com.nanri.aiimage.modules.dedupe.mapper.DedupeTotalDataMapper;
|
||||
import com.nanri.aiimage.modules.dedupe.model.entity.DedupeTotalDataEntity;
|
||||
import com.nanri.aiimage.modules.shopkey.service.ShopManageGroupService;
|
||||
import org.apache.ibatis.builder.MapperBuilderAssistant;
|
||||
import org.junit.jupiter.api.DisplayName;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.junit.jupiter.api.extension.ExtendWith;
|
||||
import org.mockito.ArgumentCaptor;
|
||||
import org.mockito.InjectMocks;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.junit.jupiter.MockitoExtension;
|
||||
@@ -23,6 +29,10 @@ import java.util.Set;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
import static org.assertj.core.api.Assertions.assertThatThrownBy;
|
||||
import static org.junit.jupiter.api.Assertions.assertFalse;
|
||||
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||
import static org.mockito.ArgumentMatchers.any;
|
||||
import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
/**
|
||||
@@ -130,4 +140,36 @@ class DedupeTotalDataCompanySuperAdminGroupAccessTest {
|
||||
.isInstanceOf(BusinessException.class)
|
||||
.hasMessage("请选择分组");
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("读列表按行归属收窄:company_id = 本公司,不再叠「成员上传」(代导入/上传者已删两族不再漏)")
|
||||
@SuppressWarnings({"rawtypes", "unchecked"})
|
||||
void pageNarrowsCompanySuperAdminByRowCompanyId() {
|
||||
// 2026-10-09 口径切换(wholeCompany 分支):原条件 uploader_user_id IN (本公司成员)
|
||||
// 会整批漏掉两类行——超管代导入的行(uploader=超管,不属本公司)与上传账号被硬删的行
|
||||
// (JOIN 不上任何成员集)。先锋公司超管(uid=1206)对 admin 代导入的 14 行与组 33 的
|
||||
// 1452 行历史数据一行都看不到,切到行 company_id 后可见。
|
||||
TableInfoHelper.initTableInfo(
|
||||
new MapperBuilderAssistant(new MybatisConfiguration(), ""),
|
||||
DedupeTotalDataEntity.class);
|
||||
stubCompanySuperAdmin();
|
||||
when(shopManageGroupService.listCompanyGroupIds(List.of(OPERATOR_ID)))
|
||||
.thenReturn(Set.of(OWN_COMPANY_GROUP_ID));
|
||||
when(dedupeTotalDataMapper.selectCount(any())).thenReturn(0L);
|
||||
when(dedupeTotalDataMapper.selectList(any())).thenReturn(List.of());
|
||||
|
||||
service.page(1, 15, "", "", null, null, null, null, null, OPERATOR_ID, null);
|
||||
|
||||
ArgumentCaptor<LambdaQueryWrapper<DedupeTotalDataEntity>> captor =
|
||||
ArgumentCaptor.forClass((Class) LambdaQueryWrapper.class);
|
||||
verify(dedupeTotalDataMapper).selectCount(captor.capture());
|
||||
LambdaQueryWrapper<DedupeTotalDataEntity> query = captor.getValue();
|
||||
query.getSqlSegment();
|
||||
assertTrue(query.getSqlSegment().contains("company_id"),
|
||||
"公司超管必须按行 company_id 看全公司: " + query.getSqlSegment());
|
||||
assertTrue(query.getParamNameValuePairs().containsValue(OWN_COMPANY_ID),
|
||||
"company_id 收窄值必须是本公司: " + query.getParamNameValuePairs());
|
||||
assertFalse(query.getSqlSegment().contains("uploader_user_id"),
|
||||
"不许回退成「成员上传」口径(会漏代导入/上传者已删两族): " + query.getSqlSegment());
|
||||
}
|
||||
}
|
||||
|
||||
+29
-1
@@ -266,6 +266,34 @@ class DedupeTotalDataServiceTest {
|
||||
assertTrue(query.getCustomSqlSegment().contains("FIND_IN_SET"));
|
||||
}
|
||||
|
||||
@Test
|
||||
@SuppressWarnings({"rawtypes", "unchecked"})
|
||||
void pageNarrowsSuperAdminByRowCompanyId() {
|
||||
// 2026-10-09 口径切换:超管切公司 tab 后按行自己的 company_id 筛(原按上传账号集合)。
|
||||
// 这条钉的是 applyCompanyScope 的那一刀:删掉 eq(company_id,…),切 tab 就成装饰品;
|
||||
// 反向(又冒回 uploader_user_id)则 admin 代导入的行会重新归错家。
|
||||
TableInfoHelper.initTableInfo(
|
||||
new MapperBuilderAssistant(new MybatisConfiguration(), ""),
|
||||
DedupeTotalDataEntity.class);
|
||||
when(adminUserMapper.selectById(1L)).thenReturn(user(1L, "super_admin", "root"));
|
||||
when(dedupeTotalDataMapper.selectCount(any())).thenReturn(0L);
|
||||
when(dedupeTotalDataMapper.selectList(any())).thenReturn(List.of());
|
||||
|
||||
service.page(1, 15, "", "", null, null, null, null, null, 1L, 2L);
|
||||
|
||||
ArgumentCaptor<LambdaQueryWrapper<DedupeTotalDataEntity>> queryCaptor =
|
||||
ArgumentCaptor.forClass((Class) LambdaQueryWrapper.class);
|
||||
verify(dedupeTotalDataMapper).selectCount(queryCaptor.capture());
|
||||
LambdaQueryWrapper<DedupeTotalDataEntity> query = queryCaptor.getValue();
|
||||
query.getSqlSegment();
|
||||
assertTrue(query.getSqlSegment().contains("company_id"),
|
||||
"超管切公司后必须按行 company_id 收窄: " + query.getSqlSegment());
|
||||
assertTrue(query.getParamNameValuePairs().containsValue(2L),
|
||||
"company_id 收窄值必须是 tab 传下来的 2: " + query.getParamNameValuePairs());
|
||||
assertFalse(query.getSqlSegment().contains("uploader_user_id"),
|
||||
"不许再按上传账号收窄: " + query.getSqlSegment());
|
||||
}
|
||||
|
||||
@Test
|
||||
void concurrentDuplicateDuringImportIsSkipped() throws Exception {
|
||||
when(adminUserMapper.selectById(23L)).thenReturn(user(23L, "normal", "member-a"));
|
||||
@@ -382,7 +410,7 @@ class DedupeTotalDataServiceTest {
|
||||
when(dedupeTotalDataMapper.delete(any())).thenReturn(1);
|
||||
|
||||
service.deleteBatchByDataValues(List.of("B012345678"),
|
||||
new DedupeTotalDataService.AccessScope(true, java.util.Set.of(), java.util.Set.of(), false),
|
||||
new DedupeTotalDataService.AccessScope(true, java.util.Set.of(), java.util.Set.of(), false, null),
|
||||
null, 3L);
|
||||
|
||||
ArgumentCaptor<LambdaQueryWrapper<DedupeTotalDataEntity>> captor =
|
||||
|
||||
Reference in New Issue
Block a user