fix(品牌数据库): 全平台共享落到实处——读改删都不再按分组锁人,分组列对所有人展示

用户 10-07 报「用其他公司登录后品牌数据库没共享到、看不到数据」。页面文案写着
"本页全平台共享,不按公司区分",读侧却仍按操作者换一份可见集。真凶不是 company_id
(V151 已把它退掉),而是 10-04 就记下的那条:非站点超管一律
`record_source='MANUAL' AND group_id=<可访问分组里 id 最小的那一个>`,账号没有分组时
更狠——`id = -1` 整页判空。`company_super_admin` 在控制器那句
`"super_admin".equals(currentRole)` 上判 false,于是整页落成 0 行。

上线前只读取证(内部令牌通道,公开链 api.aishufu.top):
- operatorId=1205 张三(company_super_admin,公司3)→ total=0
- operatorId=1193 华华11(admin,公司2)→ total=0
- operatorId=1(站点超管)→ total=15234
- 库侧:biz_invalid_asin_data 共 15234 行,其中 AUTO 15174 行的 group_id 全为 NULL,
  MANUAL 只有 60 行 → "只给 MANUAL + 单个分组"这条谓词必然筛空。

改法(用户选「全放开:读+改+删都不锁分组」+「显示分组列」):
- InvalidAsinDataService 的 page/create/update/delete 形参表里不再有 superAdmin,
  page 连 operatorId 都不收 ⇒ 想把「按人收窄」接回来必须先改签名,这是编译期护栏。
- 分组只在校验「存在」这一步过(getAccessibleById 的 superAdmin=true 是正当用法)。
  AUTO 行仍不在这一页重归分组——那是来源语义,与角色无关。
- 新增 GET /api/admin/invalid-asin-data/groups:这一页自己的全平台分组名册,走与列表
  同一道页面准入门,不开成匿名口。不能复用店铺页的 /shop-manages/groups——它对非超管
  只返回本人可访问的分组,共享列表里别家的分组就筛不动。
- 前端:分组列/筛选/表单下拉对所有拿到这一页的人展示且可选,lockedGroupId 模型退役。

护栏:
- InvalidAsinDataServiceTest 13 例 + InvalidAsinDataControllerTest 9 例。反向钉成对配尺子
  自证(rulersCanMeasureThePreRevertPredicate 把退回前那半条谓词原样搭一遍,证明
  「sql 里没有 record_source」「参数表里没有 -1」这几条断言真的量得到)。
- 前端删掉钉老锁形状的 align-invalid-asin-lock.test.ts,改由 align-invalid-asin-shared.test.ts
  5 例反向钉(先让同一把尺子在 QueryAsinPage/ShopManagePage 量出 v-if="isSuperAdmin" 命中,
  再断本页 0 命中;并钉分组列/筛选确实还在——「把列删了」也能满足 0 命中)。
- align-group-visibility.test.ts 是「分组列只对超管显示」的全站口径表,本页按用户批准移出
  两张 gate 表并在表头写明例外。

口径来源:用户 10-07 定的「company_super_admin 在业务数据面与 super_admin 同套逻辑,
差别只在管理动作(公司管理、建别家公司超管)」。本轮只落品牌库这一页,其余 15 个仍按
公司隔离的注册表页没动;准入门(能不能进这一页)也不变。

门禁:后端全量 3957 例 / 0 红 / 7 跳;admin-frontend-vue 1737 例全绿;vue-tsc rc=0;
变异自证 6/6 KILLED(注入 record_source 谓词 / 恒筛 group_id / id=-1 空集兜底 /
写侧改回要求可访问分组 / AUTO 行也被重归分组 / 名册端点去掉准入门),每轮还原后哈希一致。
This commit is contained in:
2026-10-07 04:52:10 +08:00
parent 2b7c377e7e
commit 351c1ac5c9
11 changed files with 404 additions and 346 deletions
@@ -63,9 +63,17 @@ public class InvalidAsinDataController {
@Parameter(description = "品牌模糊搜索") @RequestParam(name = "brand", required = false) String brand,
@Parameter(description = "分组 ID") @RequestParam(name = "group_id", required = false) Long groupId,
HttpServletRequest request) {
RequestOperator operator = requireInvalidAsinDataAccess(request);
return ApiResponse.success(invalidAsinDataService.page(
page, pageSize, keyword, dataValue, brand, groupId, operator.id(), operator.superAdmin()));
requireInvalidAsinDataAccess(request);
return ApiResponse.success(invalidAsinDataService.page(page, pageSize, keyword, dataValue, brand, groupId));
}
@GetMapping("/groups")
@Operation(summary = "查询分组筛选名册", description = "品牌数据库页的分组下拉名册:全平台全量,"
+ "不按操作者可访问集收窄——这一页的数据本身跨公司共享,筛得动别家的分组才有意义。")
public ApiResponse<java.util.List<com.nanri.aiimage.modules.shopkey.model.vo.ShopManageGroupItemVo>> listGroups(
HttpServletRequest request) {
requireInvalidAsinDataAccess(request);
return ApiResponse.success(invalidAsinDataService.listGroupOptions());
}
@PostMapping
@@ -78,8 +86,7 @@ public class InvalidAsinDataController {
HttpServletRequest httpRequest,
@Valid @RequestBody InvalidAsinDataCreateRequest request) {
RequestOperator operator = requireInvalidAsinDataAccess(httpRequest);
return ApiResponse.success("创建成功", invalidAsinDataService.create(
request, operator.id(), operator.superAdmin()));
return ApiResponse.success("创建成功", invalidAsinDataService.create(request, operator.id()));
}
@PutMapping("/{id}")
@@ -94,8 +101,7 @@ public class InvalidAsinDataController {
HttpServletRequest httpRequest,
@Valid @RequestBody InvalidAsinDataUpdateRequest request) {
RequestOperator operator = requireInvalidAsinDataAccess(httpRequest);
return ApiResponse.success("更新成功", invalidAsinDataService.update(
id, request, operator.id(), operator.superAdmin()));
return ApiResponse.success("更新成功", invalidAsinDataService.update(id, request, operator.id()));
}
@DeleteMapping("/{id}")
@@ -106,9 +112,9 @@ public class InvalidAsinDataController {
})
public ApiResponse<Void> delete(
@Parameter(description = "主键ID", required = true) @PathVariable Long id,
HttpServletRequest request) {
RequestOperator operator = requireInvalidAsinDataAccess(request);
invalidAsinDataService.delete(id, operator.id(), operator.superAdmin());
HttpServletRequest httpRequest) {
requireInvalidAsinDataAccess(httpRequest);
invalidAsinDataService.delete(id);
return ApiResponse.success("删除成功", null);
}
@@ -9,18 +9,23 @@ import com.nanri.aiimage.modules.invalidasin.model.entity.InvalidAsinDataEntity;
import com.nanri.aiimage.modules.invalidasin.model.vo.InvalidAsinDataItemVo;
import com.nanri.aiimage.modules.invalidasin.model.vo.InvalidAsinDataPageVo;
import com.nanri.aiimage.common.model.entity.ShopManageGroupEntity;
import com.nanri.aiimage.modules.shopkey.model.vo.ShopManageGroupItemVo;
import com.nanri.aiimage.modules.shopkey.service.ShopManageGroupService;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.server.ResponseStatusException;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Set;
/**
* 品牌数据库(不符合规则的 ASIN / 品牌)。
*
* <p>2026-10-06 定案、2026-10-07 收尾:这一页<b>全平台一份</b>,读、改、删都不按分组或来源设可见性差别。
* 站点超管与公司超级管理员在这一页看到的是同一份数据、用同一套分组筛选;两者的权限差别只在
* 公司管理与建号那一类管理动作上,不在这里。</p>
*/
@Service
@RequiredArgsConstructor
public class InvalidAsinDataService {
@@ -31,8 +36,13 @@ public class InvalidAsinDataService {
private final InvalidAsinDataMapper invalidAsinDataMapper;
private final ShopManageGroupService shopManageGroupService;
/** 分组筛选与表单下拉的名册:整平台全量,不按操作者可访问集收窄。 */
public List<ShopManageGroupItemVo> listGroupOptions() {
return shopManageGroupService.list();
}
public InvalidAsinDataPageVo page(long page, long pageSize, String keyword, String dataValue, String brand,
Long groupId, Long operatorId, boolean superAdmin) {
Long groupId) {
long safePage = Math.max(page, 1);
long safePageSize = Math.min(Math.max(pageSize, 1), 100);
String safeKeyword = keyword == null ? "" : keyword.trim();
@@ -46,15 +56,7 @@ public class InvalidAsinDataService {
.like(!safeDataValue.isEmpty(), InvalidAsinDataEntity::getDataValue, safeDataValue)
.like(!safeBrand.isEmpty(), InvalidAsinDataEntity::getBrand, safeBrand)
.orderByDesc(InvalidAsinDataEntity::getId);
if (!superAdmin) {
Long fixedGroupId = resolveFixedAccessibleGroupId(operatorId);
if (fixedGroupId == null) {
query.eq(InvalidAsinDataEntity::getId, -1L);
} else {
query.eq(InvalidAsinDataEntity::getRecordSource, RECORD_SOURCE_MANUAL)
.eq(InvalidAsinDataEntity::getGroupId, fixedGroupId);
}
} else if (groupId != null && groupId > 0) {
if (groupId != null && groupId > 0) {
query.eq(InvalidAsinDataEntity::getGroupId, groupId);
}
Long total = invalidAsinDataMapper.selectCount(query);
@@ -78,8 +80,8 @@ public class InvalidAsinDataService {
}
@Transactional
public InvalidAsinDataItemVo create(InvalidAsinDataCreateRequest request, Long operatorId, boolean superAdmin) {
ShopManageGroupEntity group = resolveManualWriteGroup(request.getGroupId(), operatorId, superAdmin);
public InvalidAsinDataItemVo create(InvalidAsinDataCreateRequest request, Long operatorId) {
ShopManageGroupEntity group = requireGroup(request.getGroupId(), operatorId);
String dataValue = normalizeRequired(request.getDataValue(), "ASIN 不能为空");
String brand = normalizeRequired(request.getBrand(), "品牌不能为空").toLowerCase(Locale.ROOT);
ensureUnique(dataValue, null);
@@ -94,16 +96,10 @@ public class InvalidAsinDataService {
}
@Transactional
public InvalidAsinDataItemVo update(Long id, InvalidAsinDataUpdateRequest request, Long operatorId, boolean superAdmin) {
public InvalidAsinDataItemVo update(Long id, InvalidAsinDataUpdateRequest request, Long operatorId) {
InvalidAsinDataEntity entity = getById(id);
ShopManageGroupEntity fixedGroup = ensureRecordAccess(entity, operatorId, superAdmin);
ShopManageGroupEntity writeGroup = null;
if (isManualRecord(entity)) {
Long requestedGroupId = requireGroupId(request.getGroupId());
writeGroup = superAdmin
? shopManageGroupService.getAccessibleById(requestedGroupId, operatorId, true)
: resolveLockedGroup(requestedGroupId, fixedGroup);
}
// 自动导入的行分组由采集侧决定,这一页不替它重归:沿用改造前口径,与角色无关。
ShopManageGroupEntity writeGroup = isManualRecord(entity) ? requireGroup(request.getGroupId(), operatorId) : null;
String dataValue = normalizeRequired(request.getDataValue(), "ASIN 不能为空");
String brand = normalizeRequired(request.getBrand(), "品牌不能为空").toLowerCase(Locale.ROOT);
ensureUnique(dataValue, id);
@@ -119,21 +115,14 @@ public class InvalidAsinDataService {
}
@Transactional
public void delete(Long id, Long operatorId, boolean superAdmin) {
InvalidAsinDataEntity entity = getById(id);
ensureRecordAccess(entity, operatorId, superAdmin);
invalidAsinDataMapper.deleteById(entity.getId());
public void delete(Long id) {
invalidAsinDataMapper.deleteById(getById(id).getId());
}
private ShopManageGroupEntity resolveManualWriteGroup(Long requestedGroupId, Long operatorId, boolean superAdmin) {
Long normalizedRequestedGroupId = requireGroupId(requestedGroupId);
if (superAdmin) {
return shopManageGroupService.getAccessibleById(
normalizedRequestedGroupId, operatorId, true);
}
Long fixedGroupId = requireFixedAccessibleGroupId(operatorId);
ensureRequestedLockedGroup(normalizedRequestedGroupId, fixedGroupId);
return shopManageGroupService.getAccessibleById(fixedGroupId, operatorId, false);
private ShopManageGroupEntity requireGroup(Long requestedGroupId, Long operatorId) {
// 只校验分组存在:这一页的分组是行上的归类标签、不是可见性边界,
// 所以走 superAdmin=true 让 getAccessibleById 跳过「可访问集」那一步(分组不存在仍报「分组不存在」)。
return shopManageGroupService.getAccessibleById(requireGroupId(requestedGroupId), operatorId, true);
}
private InvalidAsinDataEntity getById(Long id) {
@@ -184,57 +173,6 @@ public class InvalidAsinDataService {
.replaceAll("\\s+", " ");
}
private ShopManageGroupEntity ensureRecordAccess(InvalidAsinDataEntity entity, Long operatorId, boolean superAdmin) {
if (superAdmin) {
return null;
}
if (!isManualRecord(entity) || entity.getGroupId() == null || entity.getGroupId() <= 0) {
throw new ResponseStatusException(HttpStatus.FORBIDDEN, "无权操作该品牌数据");
}
Long fixedGroupId = resolveFixedAccessibleGroupId(operatorId);
if (fixedGroupId == null || !fixedGroupId.equals(entity.getGroupId())) {
throw new ResponseStatusException(HttpStatus.FORBIDDEN, "无权操作非固定分组数据");
}
try {
return shopManageGroupService.getAccessibleById(fixedGroupId, operatorId, false);
} catch (BusinessException exception) {
throw new ResponseStatusException(HttpStatus.FORBIDDEN, "无权操作该品牌数据");
}
}
private Long requireFixedAccessibleGroupId(Long operatorId) {
Long fixedGroupId = resolveFixedAccessibleGroupId(operatorId);
if (fixedGroupId == null) {
throw new BusinessException("当前用户没有可访问的分组");
}
return fixedGroupId;
}
private Long resolveFixedAccessibleGroupId(Long operatorId) {
Set<Long> accessibleGroupIds = shopManageGroupService.listAccessibleGroupIds(operatorId, false);
if (accessibleGroupIds == null) {
return null;
}
return accessibleGroupIds.stream()
.filter(groupId -> groupId != null && groupId > 0)
.min(Long::compareTo)
.orElse(null);
}
private ShopManageGroupEntity resolveLockedGroup(Long requestedGroupId, ShopManageGroupEntity fixedGroup) {
if (fixedGroup == null || fixedGroup.getId() == null) {
throw new ResponseStatusException(HttpStatus.FORBIDDEN, "无权操作非固定分组数据");
}
ensureRequestedLockedGroup(requestedGroupId, fixedGroup.getId());
return fixedGroup;
}
private void ensureRequestedLockedGroup(Long requestedGroupId, Long fixedGroupId) {
if (fixedGroupId == null || !fixedGroupId.equals(requestedGroupId)) {
throw new ResponseStatusException(HttpStatus.FORBIDDEN, "无权操作非固定分组数据");
}
}
private Long requireGroupId(Long groupId) {
if (groupId == null || groupId <= 0) {
throw new BusinessException("请选择分组");