feat(公司tab): 批次 2/3/4 再接 8 页,注册表收到 16 页——用户页回流 company_id 按新边界改写反向钉

「切 tab 数据还一样」的根因一直是分母小于现实:批次 1 只登记 8 页,本轮按控制方
三次点名扩到 16 页(company-scope.ts 是唯一清单,routes.ts 的 companyScoped 逐页对平)。

批次 2(五页 ASIN 中心):去重总数据 / 不符合ASIN / 查询ASIN / 最低价ASIN / 商品类目。
批次 3(两页店铺中心):撞款监控、店铺数据记录。这两页没有归属列可筛,归属口径是
「本公司账号名下的店铺」——后端由 DataReadScope 推公司 → 成员账号 → biz_shop_manage.
created_by_id,前端只把 activeId 当 company_id 送下去。空成员集必须交空集合,绝不能
退化成 null(null 在这里=全量,那样第二家会看到全部数据)。
批次 4(用户管理):后端早就认 company_id(只对站点超管生效,公司超管恒锁本公司),
断的是前端——UserListQuery 里连这个字段都没有,三家 tab 看的是同一份全量列表。

三处口径改动,逐条说明:
1)company-user-list.test.ts 的反向钉被改写。2026-10-04 定案把公司维度从用户页整体摘掉,
   那条钉的原文是「列表查询/筛选/行渲染不允许出现公司维度」。控制方 2026-10-05 明确要
   用户管理区分公司 tab,所以钉的边界收窄成两半:渲染层(行级公司列、「所属公司」标签、
   筛选状态、顶栏公司名)仍不得回流;请求层的 company_id 是这次加回来的,尺子换成
   「取值口唯一」——页面每处 companyId 都必须等于 companyTab.requestCompanyId,且
   normalizeUserPageParams/toUserListQuery 两只白名单构造器体内不许出现公司值。
   新增一支行为钉:往归一化里传 companyId 必须被丢掉,这是 users.ts 读原始入参的全部理由
   (写成 normalized.companyId 时 TS 照样绿、运行时恒 undefined)。
2)align-dup-console 那条 watch 看守的 token 扩到含 reload。变异自证里「删掉 void
   loadConsole()」当场全绿:体里的清筛选项守住了,重新取数那半没人守。批次 3/4 三对
   token 一起写到 reload 为止(批次 1/2 的老条目不动)。
3)公司管理页补正/反向两把尺子:company-config-entry-super-only 新增「吃公司 tab 的页面
   集合恰好等于 COMPANY_SCOPED_PAGES 的 pageFiles」——按代码真值比,不按清单比,所以
   清单不改一字而往 CompaniesPage.vue 里塞 store 也会红。谓词带括号,否则 import 行也算消费者。

菜单权限(admin_columns)本轮不动:MenusPage 只消费 /api/admin/permission-menus 这一份全局
菜单字典,切 tab 一样是数据本身全局,不是筛选坏了。真问题在写侧——PermissionMenuService
create/update/delete 只有 ensureAdminOperatorIfPresent(isAdmin 即放行),公司管理员改的是
全平台的菜单行。收窄为仅站点超管 vs 给 permission_menu 加归属列,两种改法代价差一个量级,
留给控制方定档。

护栏:G1 发送口 22 个 / 页面分组 17、watch 体看守 10 对、operation-guide 的 tab 文案 15 页
(撞款监控是显式豁免,另有一条自检盯「豁免落空」)。
变异自证 12/12 全杀(前端 10 + 公司管理反向钉 2),分母钉死在 27 例。
门禁:后端全量 3823 例 / 0 失败 / 0 错误 / 7 skipped,BUILD SUCCESS;admin-frontend-vue
1741 例 / 0 红;vue-tsc rc=0。首轮后端 4 红是另一路 task_partial 改动与本轮编译抢跑,
单跑 13 例已绿,本笔不含他们的任何文件。

未上线:jar 与 admin-vue 都没出包,V147 未在生产执行。
This commit is contained in:
2026-10-06 02:32:59 +08:00
parent e5e36aa713
commit 16583f578d
87 changed files with 3519 additions and 459 deletions
@@ -1039,7 +1039,8 @@ public class BrandTaskService {
} catch (BusinessException ex) {
throw ex;
} catch (IOException ex) {
throw new BusinessException("读取 Excel 失败");
log.warn("[brand] Excel 解析失败 file={} err={}", inputFile.getName(), ex.getMessage(), ex);
throw new BusinessException("读取 Excel 失败", ex);
}
return context.finish();
}
@@ -111,7 +111,7 @@ public class CollectDataBrandRecheckInjector {
List<CollectDataResultRowVo> chunkRejected = rowsOfBrands(rows, rejectedBrands);
if (!chunkRejected.isEmpty()) {
// INSERT IGNORE 幂等:重复补测同品牌不会在无效品牌表翻倍
rejectedRows += invalidAsinBatchWriter.writeBatch(chunkRejected);
rejectedRows += invalidAsinBatchWriter.writeBatch(chunkRejected, task.getUserId());
}
}
if (cleanBrands.isEmpty()) {
@@ -896,7 +896,7 @@ public class CollectDataService {
// 8 行查询失败被写表后误杀,最终结果 Excel 0 行)。rejected 为空时
// 不触发任何写入,避免空批次无意义调用。
if (!brandOutcome.rejected().isEmpty()) {
invalidAsinBatchWriter.writeBatch(brandOutcome.rejected());
invalidAsinBatchWriter.writeBatch(brandOutcome.rejected(), task.getUserId());
}
List<CollectDataResultRowVo> accepted = brandOutcome.accepted();
// 结果明细改为 chunk 级存储:整个 chunk 的 accepted 行共享一个
@@ -1,5 +1,6 @@
package com.nanri.aiimage.modules.collectdata.util;
import com.nanri.aiimage.common.service.CompanyScopeSupport;
import com.nanri.aiimage.modules.collectdata.model.vo.CollectDataResultRowVo;
import com.nanri.aiimage.modules.invalidasin.mapper.InvalidAsinDataMapper;
import com.nanri.aiimage.modules.invalidasin.model.entity.InvalidAsinDataEntity;
@@ -15,30 +16,52 @@ import java.util.regex.Pattern;
/**
* invalid ASIN 批量写入器:把不合规 ASIN 行按批次批量 INSERT IGNORE 写入
* biz_invalid_asin_data,替代逐行 insert + 捕获唯一键异常的旧路径。
* 幂等由唯一键 (data_value, brand) + INSERT IGNORE 语义保证;批量失败时
* 幂等由唯一键 (company_id, data_value, brand) + INSERT IGNORE 语义保证;批量失败时
* 跳过该批(记录计数,不中断提交流程),恢复后继续后续批次。
* 空输入、无合法 data_value/brand 的行、null 行均安全跳过,不发起调用。
*
* <p>归属(company_id + uploader_user_id)由调用方给任务发起账号,本类负责推公司:
* 此前实体与 INSERT 列清单都不带这两列,V145 补的 company_id 全靠 DEFAULT 1 盖,
* 于是第 2 家公司跑货源产生的行会被记成第 1 家,且事后分不开。</p>
*/
@Slf4j
@Component
public class CollectDataInvalidAsinBatchWriter {
/** 巡检可 grep 的标记:账号已不存在、推不出公司,这批 rejected 品牌整批不写。 */
static final String OWNER_UNRESOLVED_MARKER = "INVALID_ASIN_OWNER_UNRESOLVED";
private static final Pattern WHITESPACE_PATTERN = Pattern.compile("\\s+");
private final InvalidAsinDataMapper invalidAsinDataMapper;
private final CompanyScopeSupport companyScopeSupport;
private final int batchSize;
public CollectDataInvalidAsinBatchWriter(InvalidAsinDataMapper invalidAsinDataMapper,
CompanyScopeSupport companyScopeSupport,
@Value("${aiimage.collect-data.invalid-asin-batch-size:100}") int batchSize) {
this.invalidAsinDataMapper = invalidAsinDataMapper;
this.companyScopeSupport = companyScopeSupport;
this.batchSize = Math.max(1, batchSize);
}
/** 批量写入并返回实际尝试写入的行数(INSERT IGNORE 忽略重复,幂等)。 */
public int writeBatch(List<CollectDataResultRowVo> rows) {
/**
* 批量写入并返回实际尝试写入的行数(INSERT IGNORE 忽略重复,幂等)。
*
* @param uploaderUserId 任务发起账号(biz_file_task.user_id);推不出公司时整批不写并打
* {@link #OWNER_UNRESOLVED_MARKER}——宁可少记一条黑名单,
* 也不把行盖成别家公司(那会让另一家的正常品牌被静默过滤)
*/
public int writeBatch(List<CollectDataResultRowVo> rows, Long uploaderUserId) {
if (rows == null || rows.isEmpty()) {
return 0;
}
Long companyId = companyScopeSupport.companyIdOrNull(uploaderUserId);
if (companyId == null) {
log.warn("{} 无法按账号推出处置公司,本批不写入无效品牌表 rows={} userId={}",
OWNER_UNRESOLVED_MARKER, rows.size(), uploaderUserId);
return 0;
}
int written = 0;
for (int start = 0; start < rows.size(); start += batchSize) {
int end = Math.min(start + batchSize, rows.size());
@@ -47,6 +70,8 @@ public class CollectDataInvalidAsinBatchWriter {
for (CollectDataResultRowVo row : batch) {
InvalidAsinDataEntity entity = toEntity(row);
if (entity != null) {
entity.setCompanyId(companyId);
entity.setUploaderUserId(uploaderUserId);
entities.add(entity);
}
}
@@ -20,7 +20,9 @@ import java.util.Map;
* 唯一理由是发布期的旧 jar,§8.2 / V145 头注释)。正因为它安静,所以由代码来喊,而不是靠人记得。</p>
*
* <p>盯的列随迁移增长:V143 给 {@code users} 加过一版(DEFAULT 已由 V144 摘),V145 给两张规则库
* 各加一版。一张表一行都插不进来的时候才是"摘干净",所以这里探的是【清单】而不是单个列名。</p>
* 各加一版,V147 给 {@code biz_product_category} 加一版。一张表一行都插不进来的时候才是"摘干净",
* 所以这里探的是【清单】而不是单个列名。清单与探针 SQL 的 IN 列表由 {@code CompanyDefaultGuardTest}
* 双向钉同源:只钉"清单里的都在 SQL 里"会漏掉"SQL 里有、清单漏了"那一半,而那一半才是静默的形状。</p>
*
* <p>标记串({@link #ALARM} / {@link #PROBE_FAILED})是纯 ASCII:巡检脚本要在 docker logs 里
* grep 它,中文一旦在容器里变了编码就整条签名失效。</p>
@@ -39,14 +41,17 @@ public class CompanyDefaultGuard {
/**
* 该带 company_id 且历史上可能被塞过 DEFAULT 的表。新增一列就要在这里登记一条——
* 漏登记的后果不是报错,是哨兵对着一个不存在的列一声不响({@link #check} 会把它当探不到处理)。
* V147 的 {@code biz_product_category} 是第四条:它的 DEFAULT 1 同样只为同批旧 jar 存在,
* 摘除动作与上面三张同形(一条元数据操作,禁 MODIFY)。
*/
static final List<String> WATCHED_TABLES = List.of(
"users", "biz_invalid_asin_data", "biz_dedupe_total_data");
"users", "biz_invalid_asin_data", "biz_dedupe_total_data", "biz_product_category");
private static final String COLUMN_DEFAULT_SQL = """
SELECT TABLE_NAME, COLUMN_DEFAULT FROM information_schema.COLUMNS
WHERE TABLE_SCHEMA = DATABASE() AND COLUMN_NAME = 'company_id'
AND TABLE_NAME IN ('users', 'biz_invalid_asin_data', 'biz_dedupe_total_data')
AND TABLE_NAME IN ('users', 'biz_invalid_asin_data', 'biz_dedupe_total_data',
'biz_product_category')
""";
private final CompanyMapper companyMapper;
@@ -3,6 +3,7 @@ package com.nanri.aiimage.modules.dedupe.controller;
import com.nanri.aiimage.common.api.ApiResponse;
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.util.DownloadHeaderUtil;
import com.nanri.aiimage.modules.dedupe.model.dto.DedupeTotalDataCreateRequest;
import com.nanri.aiimage.modules.dedupe.model.dto.DedupeTotalDataUpdateRequest;
@@ -48,6 +49,7 @@ import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
import java.security.MessageDigest;
import java.util.List;
@RestController
@RequiredArgsConstructor
@@ -65,6 +67,7 @@ public class DedupeTotalDataController {
private final DedupeTotalDataService dedupeTotalDataService;
private final AdminAuthSupport adminAuthSupport;
private final PermissionMenuService permissionMenuService;
private final DataReadScope dataReadScope;
@@ -86,10 +89,16 @@ public class DedupeTotalDataController {
@Parameter(description = "国家代码(如 DE、UK)") @RequestParam(name = "country", required = false) String country,
@Parameter(description = "顺序翻页游标(上一页返回的 nextLastId;传了就忽略 page 偏移)")
@RequestParam(name = "last_id", required = false) Long lastId,
@Parameter(description = "公司 ID") @RequestParam(name = "company_id", required = false) Long companyId,
HttpServletRequest request) {
RequestOperator operator = requireDedupeTotalDataAccess(request);
AdminUserEntity user = operator.user();
List<Long> memberIds = operator.superAdmin()
? dataReadScope.readScope(user, companyId).userIdsOr(null)
: null;
return ApiResponse.success(dedupeTotalDataService.page(
page, pageSize, keyword, username, startDate, endDate, groupId, country, lastId, operator.id()));
page, pageSize, keyword, username, startDate, endDate, groupId, country, lastId,
operator.id(), memberIds));
}
@GetMapping("/export")
@@ -102,19 +111,27 @@ public class DedupeTotalDataController {
@RequestParam(name = "end_date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate endDate,
@Parameter(description = "分组 ID") @RequestParam(name = "group_id", required = false) Long groupId,
@Parameter(description = "国家代码(如 DE、UK)") @RequestParam(name = "country", required = false) String country,
@Parameter(description = "公司 ID") @RequestParam(name = "company_id", required = false) Long companyId,
HttpServletRequest request) {
if (startDate != null && endDate != null && startDate.isAfter(endDate)) {
throw new BusinessException(400, "invalid export date range");
}
RequestOperator operator = requireDedupeTotalDataAccess(request);
AdminUserEntity user = operator.user();
Long operatorId = operator.id();
List<Long> memberIds = operator.superAdmin()
? dataReadScope.readScope(user, companyId).userIdsOr(null)
: null;
boolean monthlyZip = isCrossMonthRange(startDate, endDate);
String filename = "dedupe-total-data-" + LocalDateTime.now().format(EXPORT_FILENAME_FORMATTER)
+ (monthlyZip ? ".zip" : ".xlsx");
// 两个分支的实参表都不许出现嵌套括号(operator.id() 那种写法护栏 G2 的单层括号判据看不穿,
// 会把它当成"范围没交给任何调用"而假红),所以 operatorId 先在局部变量里落好。
StreamingResponseBody body = monthlyZip
? outputStream -> dedupeTotalDataService.writeMonthlyZipExport(
outputStream, username, startDate, endDate, groupId, country, operator.id())
outputStream, username, startDate, endDate, groupId, country, operatorId, memberIds)
: outputStream -> dedupeTotalDataService.writeExport(
outputStream, username, startDate, endDate, groupId, country, operator.id());
outputStream, username, startDate, endDate, groupId, country, operatorId, memberIds);
return ResponseEntity.ok()
.header(HttpHeaders.CONTENT_DISPOSITION, DownloadHeaderUtil.contentDisposition(filename))
.contentType(MediaType.parseMediaType(monthlyZip ? ZIP_CONTENT_TYPE : XLSX_CONTENT_TYPE))
@@ -224,7 +241,7 @@ public class DedupeTotalDataController {
if (!superAdmin && !hasDedupeTotalDataPermission(operator)) {
throw new BusinessException(403, "无权访问数据去重总数据");
}
return new RequestOperator(operator.getId(), superAdmin);
return new RequestOperator(operator.getId(), superAdmin, operator);
}
private AdminUserEntity resolveOperator(HttpServletRequest request) {
@@ -267,7 +284,13 @@ public class DedupeTotalDataController {
private record RequestOperator(Long id, boolean superAdmin) {
// 公司 tab 的读范围就地算在 handler 里,不留私有收口方法:G2 的断言 A 只在这支 handler 的
// 块内找 readScope(,私有方法在它自己的闭括号处收口、不算在内(CompanyIdParamGoesThroughReadScopeTest
// 类注释第 5、7 条),挪进去 = 这一页的 tab 没人看守。收窄只给超管:非超管已由 resolveAccessScope
// 按会话裁剪,且他的可见集里含「靠分组可见」的行,叠一层账号 IN 会把那批行静默删掉
// (同 ShopManageController 的口径)。
private record RequestOperator(Long id, boolean superAdmin, AdminUserEntity user) {
}
private boolean isTrustedInternalRequest(String suppliedToken) {
return adminAuthSupport.isTrustedSuppliedToken(suppliedToken);
@@ -160,16 +160,18 @@ public class DedupeTotalDataService {
public DedupeTotalDataPageVo page(long page, long pageSize, String keyword, String username,
LocalDate startDate, LocalDate endDate, Long groupId, String country, Long operatorId) {
return page(page, pageSize, keyword, username, startDate, endDate, groupId, country, null, operatorId);
return page(page, pageSize, keyword, username, startDate, endDate, groupId, country, null, operatorId, null);
}
/**
* @param lastId keyset 游标(上一页返回的 nextLastId);非空时忽略 page 偏移,
* 直接按 id 倒序取"比它小"的一页,避免深分页 offset 扫索引的代价
* @param companyMemberIds 公司 tab 收窄后的成员账号集({@code DataReadScope} 给出);
* null = 不筛(超管没选公司 / 非超管走会话范围)
*/
public DedupeTotalDataPageVo page(long page, long pageSize, String keyword, String username,
LocalDate startDate, LocalDate endDate, Long groupId, String country,
Long lastId, Long operatorId) {
Long lastId, Long operatorId, List<Long> companyMemberIds) {
if (startDate != null && endDate != null && startDate.isAfter(endDate)) {
throw new BusinessException("开始日期不能晚于结束日期");
}
@@ -194,6 +196,7 @@ public class DedupeTotalDataService {
endDate == null ? null : endDate.plusDays(1).atStartOfDay())
.orderByDesc(DedupeTotalDataEntity::getId);
applyGroupScope(query, scope, groupId);
applyCompanyScope(query, companyMemberIds);
Long total = dedupeTotalDataMapper.selectCount(query);
boolean keyset = lastId != null && lastId > 0;
if (keyset) {
@@ -256,6 +259,17 @@ public class DedupeTotalDataService {
Long groupId,
String country,
Long operatorId) {
writeExport(outputStream, username, startDate, endDate, groupId, country, operatorId, null);
}
public void writeExport(OutputStream outputStream,
String username,
LocalDate startDate,
LocalDate endDate,
Long groupId,
String country,
Long operatorId,
List<Long> companyMemberIds) {
if (outputStream == null) {
throw new BusinessException("导出输出流不能为空");
}
@@ -264,7 +278,8 @@ public class DedupeTotalDataService {
}
String safeUsername = username == null ? "" : username.trim();
AccessScope scope = resolveAccessScope(operatorId);
buildExportWorkbook(outputStream, safeUsername, startDate, endDate, groupId, country, scope);
buildExportWorkbook(outputStream, safeUsername, startDate, endDate, groupId, country, scope, false,
companyMemberIds);
}
public void writeMonthlyZipExport(OutputStream outputStream,
@@ -283,11 +298,22 @@ public class DedupeTotalDataService {
Long groupId,
String country,
Long operatorId) {
writeMonthlyZipExport(outputStream, username, startDate, endDate, groupId, country, operatorId, null);
}
public void writeMonthlyZipExport(OutputStream outputStream,
String username,
LocalDate startDate,
LocalDate endDate,
Long groupId,
String country,
Long operatorId,
List<Long> companyMemberIds) {
if (outputStream == null) {
throw new BusinessException("export output stream cannot be null");
}
if (startDate == null || endDate == null || YearMonth.from(startDate).equals(YearMonth.from(endDate))) {
writeExport(outputStream, username, startDate, endDate, groupId, country, operatorId);
writeExport(outputStream, username, startDate, endDate, groupId, country, operatorId, companyMemberIds);
return;
}
if (startDate.isAfter(endDate)) {
@@ -311,7 +337,7 @@ public class DedupeTotalDataService {
LocalDate entryEndDate = endDate.isBefore(monthEnd) ? endDate : monthEnd;
zipOutputStream.putNextEntry(new ZipEntry(monthlyExportEntryName(currentMonth)));
buildExportWorkbook(zipOutputStream, safeUsername, entryStartDate, entryEndDate,
groupId, safeCountry, scope, groupPrevalidated);
groupId, safeCountry, scope, groupPrevalidated, companyMemberIds);
zipOutputStream.closeEntry();
currentMonth = currentMonth.plusMonths(1);
}
@@ -330,7 +356,7 @@ public class DedupeTotalDataService {
Long groupId,
String country,
AccessScope scope) {
buildExportWorkbook(outputStream, username, startDate, endDate, groupId, country, scope, false);
buildExportWorkbook(outputStream, username, startDate, endDate, groupId, country, scope, false, null);
}
private void buildExportWorkbook(OutputStream outputStream,
@@ -340,7 +366,8 @@ public class DedupeTotalDataService {
Long groupId,
String country,
AccessScope scope,
boolean groupPrevalidated) {
boolean groupPrevalidated,
List<Long> companyMemberIds) {
try (SXSSFWorkbook workbook = new SXSSFWorkbook(100)) {
Sheet sheet = workbook.createSheet("DedupeTotalData");
Row header = sheet.createRow(0);
@@ -354,7 +381,7 @@ public class DedupeTotalDataService {
int rowIndex = 1;
while (true) {
LambdaQueryWrapper<DedupeTotalDataEntity> pageQuery = buildExportQuery(
username, startDate, endDate, groupId, country, scope, groupPrevalidated);
username, startDate, endDate, groupId, country, scope, groupPrevalidated, companyMemberIds);
if (lastId != null) {
pageQuery.lt(DedupeTotalDataEntity::getId, lastId);
}
@@ -402,7 +429,7 @@ public class DedupeTotalDataService {
LocalDate endDate,
Long groupId,
AccessScope scope) {
return buildExportQuery(username, startDate, endDate, groupId, null, scope, false);
return buildExportQuery(username, startDate, endDate, groupId, null, scope, false, null);
}
private LambdaQueryWrapper<DedupeTotalDataEntity> buildExportQuery(String username,
@@ -411,7 +438,8 @@ public class DedupeTotalDataService {
Long groupId,
String country,
AccessScope scope,
boolean groupPrevalidated) {
boolean groupPrevalidated,
List<Long> companyMemberIds) {
String safeUsername = username == null ? "" : username.trim();
String safeCountry = country == null ? "" : country.trim();
LambdaQueryWrapper<DedupeTotalDataEntity> query = new LambdaQueryWrapper<DedupeTotalDataEntity>()
@@ -425,6 +453,7 @@ public class DedupeTotalDataService {
endDate == null ? null : endDate.plusDays(1).atStartOfDay())
.orderByDesc(DedupeTotalDataEntity::getId);
applyGroupScope(query, scope, groupId, groupPrevalidated);
applyCompanyScope(query, companyMemberIds);
return query;
}
@@ -1252,6 +1281,26 @@ public class DedupeTotalDataService {
});
}
/**
* 公司 tab 收窄:本表按「上传账号」认公司——{@code uploader_user_id} 是 NOT NULL(V75 先回灌再收紧),
* 且有 idx_uploader_user_id_id 可走点查。
*
* <p>不读 V145 新加的 company_id:写入侧实体没有该字段、{@code insertBatchIgnore} 的列清单也不带,
* 全靠 MySQL 的 DEFAULT 1 兜底,所以第 2 家账号新导入的行今天仍会被盖成公司 1。那一列不能当读侧依据。</p>
*
* <p>空集给一条不可能命中的条件而不是"不筛":tab 选了这家公司却看得到全平台,比看不到更坏。</p>
*/
private void applyCompanyScope(LambdaQueryWrapper<DedupeTotalDataEntity> query, List<Long> companyMemberIds) {
if (companyMemberIds == null) {
return;
}
if (companyMemberIds.isEmpty()) {
query.eq(DedupeTotalDataEntity::getId, -1L);
return;
}
query.in(DedupeTotalDataEntity::getUploaderUserId, companyMemberIds);
}
private ShopManageGroupEntity resolveWritableGroup(Long groupId, AdminUserEntity operator) {
if (groupId == null || groupId <= 0) {
throw new BusinessException("请选择分组");
@@ -3,6 +3,7 @@ package com.nanri.aiimage.modules.invalidasin.controller;
import com.nanri.aiimage.common.api.ApiResponse;
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.modules.invalidasin.model.dto.InvalidAsinDataCreateRequest;
import com.nanri.aiimage.modules.invalidasin.model.dto.InvalidAsinDataUpdateRequest;
import com.nanri.aiimage.modules.invalidasin.model.vo.InvalidAsinDataItemVo;
@@ -49,6 +50,7 @@ public class InvalidAsinDataController {
private final InvalidAsinDataService invalidAsinDataService;
private final AdminAuthSupport adminAuthSupport;
private final PermissionMenuService permissionMenuService;
private final DataReadScope dataReadScope;
@GetMapping
@Operation(summary = "分页查询不符合ASIN数据", description = "分页查询不符合ASIN数据,支持按 ASIN/品牌 模糊搜索。")
@@ -62,10 +64,14 @@ public class InvalidAsinDataController {
@Parameter(description = "ASIN 模糊搜索") @RequestParam(name = "data_value", required = false) String dataValue,
@Parameter(description = "品牌模糊搜索") @RequestParam(name = "brand", required = false) String brand,
@Parameter(description = "分组 ID") @RequestParam(name = "group_id", required = false) Long groupId,
@Parameter(description = "公司 ID") @RequestParam(name = "company_id", required = false) Long companyId,
HttpServletRequest request) {
RequestOperator operator = requireInvalidAsinDataAccess(request);
AdminUserEntity user = operator.user();
Long scopedCompanyId = dataReadScope.readCompanyId(user, companyId);
return ApiResponse.success(invalidAsinDataService.page(
page, pageSize, keyword, dataValue, brand, groupId, operator.id(), operator.superAdmin()));
page, pageSize, keyword, dataValue, brand, groupId, operator.id(), operator.superAdmin(),
scopedCompanyId));
}
@PostMapping
@@ -121,7 +127,7 @@ public class InvalidAsinDataController {
if (!superAdmin && !hasInvalidAsinDataPermission(operator)) {
throw new BusinessException(403, "无权访问品牌数据库");
}
return new RequestOperator(operator.getId(), superAdmin);
return new RequestOperator(operator.getId(), superAdmin, operator);
}
private AdminUserEntity resolveOperator(HttpServletRequest request) {
@@ -164,7 +170,7 @@ public class InvalidAsinDataController {
private record RequestOperator(Long id, boolean superAdmin) {
private record RequestOperator(Long id, boolean superAdmin, AdminUserEntity user) {
}
private boolean isTrustedInternalRequest(String suppliedToken) {
return adminAuthSupport.isTrustedSuppliedToken(suppliedToken);
@@ -12,18 +12,22 @@ import java.util.List;
public interface InvalidAsinDataMapper extends BaseMapper<InvalidAsinDataEntity> {
/**
* 批量 INSERT IGNORE:命中唯一键 (data_value, brand) 的重复行静默跳过,幂等。
* 批量 INSERT IGNORE:命中唯一键 (company_id, data_value, brand) 的重复行静默跳过,幂等。
* created_at/updated_at 不显式写入:依赖列的 DEFAULT CURRENT_TIMESTAMP。
* 显式传 null 会绕过默认值,在宽松 SQL 模式下落为 '0000-00-00 00:00:00',
* 随后在 NO_ZERO_DATE 模式(生产已启用)下读取即报 Zero date value prohibited。
*
* <p>company_id 与 uploader_user_id 由调用方填好:company_id 是 NOT NULL,
* 这一列显式传 null 不会走 DEFAULT 1,而是直接报错(上面 created_at 那段说的正是这类列的
* "宽松模式才静默"),所以归属推不出来时调用方必须整批不写,而不是塞 null 进来。</p>
*/
@Insert("""
<script>
INSERT IGNORE INTO biz_invalid_asin_data
(data_value, brand, record_source)
(data_value, brand, record_source, company_id, uploader_user_id)
VALUES
<foreach collection="rows" item="row" separator=",">
(#{row.dataValue}, #{row.brand}, #{row.recordSource})
(#{row.dataValue}, #{row.brand}, #{row.recordSource}, #{row.companyId}, #{row.uploaderUserId})
</foreach>
</script>
""")
@@ -18,6 +18,13 @@ public class InvalidAsinDataEntity {
private String dataValue;
private String brand;
private Long groupId;
/**
* 归属公司(company.id)。列由 V145 物化,但**实体与批量 INSERT 的列清单此前都没带它**,
* 所以 2026-10-05 生产只读取证 14,801 行全是被 DEFAULT 1 盖出来的。写入侧从本版本起显式盖章。
*/
private Long companyId;
/** 归属账号:AUTO 行取 task.user_id、MANUAL 行取操作人;V145 之前的历史行为 NULL(无从追溯)。 */
private Long uploaderUserId;
private String recordSource;
private LocalDateTime createdAt;
/**
@@ -2,6 +2,7 @@ package com.nanri.aiimage.modules.invalidasin.service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.nanri.aiimage.common.exception.BusinessException;
import com.nanri.aiimage.common.service.CompanyScopeSupport;
import com.nanri.aiimage.modules.invalidasin.mapper.InvalidAsinDataMapper;
import com.nanri.aiimage.modules.invalidasin.model.dto.InvalidAsinDataCreateRequest;
import com.nanri.aiimage.modules.invalidasin.model.dto.InvalidAsinDataUpdateRequest;
@@ -30,8 +31,10 @@ public class InvalidAsinDataService {
private final InvalidAsinDataMapper invalidAsinDataMapper;
private final ShopManageGroupService shopManageGroupService;
private final CompanyScopeSupport companyScopeSupport;
public InvalidAsinDataPageVo page(long page, long pageSize, String keyword, String dataValue, String brand, Long groupId, Long operatorId, boolean superAdmin) {
public InvalidAsinDataPageVo page(long page, long pageSize, String keyword, String dataValue, String brand,
Long groupId, Long operatorId, boolean superAdmin, Long companyFilterId) {
long safePage = Math.max(page, 1);
long safePageSize = Math.min(Math.max(pageSize, 1), 100);
String safeKeyword = keyword == null ? "" : keyword.trim();
@@ -45,6 +48,9 @@ public class InvalidAsinDataService {
.like(!safeDataValue.isEmpty(), InvalidAsinDataEntity::getDataValue, safeDataValue)
.like(!safeBrand.isEmpty(), InvalidAsinDataEntity::getBrand, safeBrand)
.orderByDesc(InvalidAsinDataEntity::getId);
if (companyFilterId != null) {
query.eq(InvalidAsinDataEntity::getCompanyId, companyFilterId);
}
if (!superAdmin) {
Long fixedGroupId = resolveFixedAccessibleGroupId(operatorId);
if (fixedGroupId == null) {
@@ -79,13 +85,17 @@ public class InvalidAsinDataService {
@Transactional
public InvalidAsinDataItemVo create(InvalidAsinDataCreateRequest request, Long operatorId, boolean superAdmin) {
ShopManageGroupEntity group = resolveManualWriteGroup(request.getGroupId(), operatorId, superAdmin);
// 归属从操作者会话推导,不读请求里的公司:超管在哪个 tab 下建都归他自己那家公司(一期定案口径)。
Long companyId = companyScopeSupport.requireCompanyId(operatorId);
String dataValue = normalizeRequired(request.getDataValue(), "ASIN 不能为空");
String brand = normalizeRequired(request.getBrand(), "品牌不能为空").toLowerCase(Locale.ROOT);
ensureUnique(dataValue, null);
ensureUnique(dataValue, null, companyId);
InvalidAsinDataEntity entity = new InvalidAsinDataEntity();
entity.setDataValue(dataValue);
entity.setBrand(brand);
entity.setGroupId(group.getId());
entity.setCompanyId(companyId);
entity.setUploaderUserId(operatorId);
entity.setRecordSource(RECORD_SOURCE_MANUAL);
invalidAsinDataMapper.insert(entity);
return toItemVo(getById(entity.getId()), group.getGroupName());
@@ -104,7 +114,7 @@ public class InvalidAsinDataService {
}
String dataValue = normalizeRequired(request.getDataValue(), "ASIN 不能为空");
String brand = normalizeRequired(request.getBrand(), "品牌不能为空").toLowerCase(Locale.ROOT);
ensureUnique(dataValue, id);
ensureUnique(dataValue, id, entity.getCompanyId());
entity.setDataValue(dataValue);
entity.setBrand(brand);
String groupName = "";
@@ -142,8 +152,13 @@ public class InvalidAsinDataService {
return entity;
}
private void ensureUnique(String dataValue, Long excludeId) {
/**
* 应用层的重复预检必须与 V145 放宽后的唯一键同宽——(company_id, data_value, brand)。
* 少了公司这一维,第 2 家永远无法新增第 1 家已有的品牌(跨公司误报「ASIN 已存在」)。
*/
private void ensureUnique(String dataValue, Long excludeId, Long companyId) {
LambdaQueryWrapper<InvalidAsinDataEntity> query = new LambdaQueryWrapper<InvalidAsinDataEntity>()
.eq(companyId != null, InvalidAsinDataEntity::getCompanyId, companyId)
.eq(InvalidAsinDataEntity::getDataValue, dataValue)
.last("LIMIT 1");
InvalidAsinDataEntity exists = invalidAsinDataMapper.selectOne(query);
@@ -1,6 +1,8 @@
package com.nanri.aiimage.modules.productcategory.controller;
import com.nanri.aiimage.common.api.ApiResponse;
import com.nanri.aiimage.common.model.entity.AdminUserEntity;
import com.nanri.aiimage.common.service.DataReadScope;
import com.nanri.aiimage.common.util.DownloadHeaderUtil;
import com.nanri.aiimage.common.security.AdminAuthSupport;
import com.nanri.aiimage.modules.productcategory.model.dto.ProductCategorySaveRequest;
@@ -8,6 +10,7 @@ import com.nanri.aiimage.modules.productcategory.model.vo.ProductCategoryItemVo;
import com.nanri.aiimage.modules.productcategory.model.vo.ProductCategoryListVo;
import com.nanri.aiimage.modules.productcategory.service.ProductCategoryService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.validation.Valid;
@@ -38,14 +41,17 @@ public class ProductCategoryController {
private final ProductCategoryService productCategoryService;
private final AdminAuthSupport adminAuthSupport;
private final DataReadScope dataReadScope;
@GetMapping("/product-categories")
@Operation(summary = "查询商品类目树")
public ApiResponse<ProductCategoryListVo> list(
HttpServletRequest request,
@RequestParam(value = "keyword", required = false) String keyword) {
adminAuthSupport.requireAdminOrInternal(request);
return ApiResponse.success(productCategoryService.list(keyword));
@RequestParam(value = "keyword", required = false) String keyword,
@Parameter(description = "公司 ID") @RequestParam(name = "company_id", required = false) Long companyId) {
AdminUserEntity operator = adminAuthSupport.requireAdminOrInternal(request);
Long scopedCompanyId = dataReadScope.readCompanyId(operator, companyId);
return ApiResponse.success(productCategoryService.list(keyword, scopedCompanyId));
}
@GetMapping("/product-categories/children")
@@ -54,9 +60,11 @@ public class ProductCategoryController {
HttpServletRequest request,
@RequestParam(value = "parent_id", required = false) Long parentId,
@RequestParam(value = "page", defaultValue = "1") Long page,
@RequestParam(value = "page_size", defaultValue = "20") Long pageSize) {
adminAuthSupport.requireAdminOrInternal(request);
return ApiResponse.success(productCategoryService.children(parentId, page, pageSize));
@RequestParam(value = "page_size", defaultValue = "20") Long pageSize,
@Parameter(description = "公司 ID") @RequestParam(name = "company_id", required = false) Long companyId) {
AdminUserEntity operator = adminAuthSupport.requireAdminOrInternal(request);
Long scopedCompanyId = dataReadScope.readCompanyId(operator, companyId);
return ApiResponse.success(productCategoryService.children(parentId, page, pageSize, scopedCompanyId));
}
@GetMapping("/product-categories/search")
@@ -65,18 +73,22 @@ public class ProductCategoryController {
HttpServletRequest request,
@RequestParam(value = "keyword", required = false) String keyword,
@RequestParam(value = "page", defaultValue = "1") Long page,
@RequestParam(value = "page_size", defaultValue = "20") Long pageSize) {
adminAuthSupport.requireAdminOrInternal(request);
return ApiResponse.success(productCategoryService.search(keyword, page, pageSize));
@RequestParam(value = "page_size", defaultValue = "20") Long pageSize,
@Parameter(description = "公司 ID") @RequestParam(name = "company_id", required = false) Long companyId) {
AdminUserEntity operator = adminAuthSupport.requireAdminOrInternal(request);
Long scopedCompanyId = dataReadScope.readCompanyId(operator, companyId);
return ApiResponse.success(productCategoryService.search(keyword, page, pageSize, scopedCompanyId));
}
@GetMapping("/product-categories/export")
@Operation(summary = "导出商品类目")
public ResponseEntity<byte[]> export(
HttpServletRequest request,
@RequestParam(value = "keyword", required = false) String keyword) {
adminAuthSupport.requireAdminOrInternal(request);
byte[] bytes = productCategoryService.export(keyword);
@RequestParam(value = "keyword", required = false) String keyword,
@Parameter(description = "公司 ID") @RequestParam(name = "company_id", required = false) Long companyId) {
AdminUserEntity operator = adminAuthSupport.requireAdminOrInternal(request);
Long scopedCompanyId = dataReadScope.readCompanyId(operator, companyId);
byte[] bytes = productCategoryService.export(keyword, scopedCompanyId);
String filename = "product-categories-" + LocalDateTime.now().format(EXPORT_FILENAME_FORMATTER) + ".xlsx";
return ResponseEntity.ok()
.header(HttpHeaders.CONTENT_DISPOSITION, DownloadHeaderUtil.contentDisposition(filename))
@@ -90,8 +102,10 @@ public class ProductCategoryController {
public ApiResponse<ProductCategoryItemVo> create(
HttpServletRequest request,
@Valid @RequestBody ProductCategorySaveRequest body) {
adminAuthSupport.requireAdminOrInternal(request);
return ApiResponse.success("创建成功", productCategoryService.create(body));
// 归属只从会话推(请求体一律不带 company_id):service 里 requireCompanyId 取不到就抛,
// 不让 V147 的 DEFAULT 1 静默兜住。
AdminUserEntity operator = adminAuthSupport.requireAdminOrInternal(request);
return ApiResponse.success("创建成功", productCategoryService.create(body, operator.getId()));
}
@PutMapping("/product-category/{id}")
@@ -13,6 +13,14 @@ public class ProductCategoryEntity {
@TableId(type = IdType.AUTO)
private Long id;
/**
* 归属公司(V147)。{@code 0} = 平台内置共享节点(不是 company 表里的行),其余是那一家的自建节点。
*
* <p>写侧必须显式盖章:这一列在 V147 里带着<b>临时</b>的 {@code DEFAULT 1}(旧 jar 的实体没这字段),
* 漏传不会报错、会被静默塞进厦门米椿花。{@code ProductCategoryService.create} 因此走
* {@code CompanyScopeSupport.requireCompanyId}(取不到就抛),不依赖这一默认值。</p>
*/
private Long companyId;
private Long parentId;
private String name;
private String categoryKey;
@@ -4,6 +4,7 @@ import cn.hutool.crypto.digest.DigestUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.nanri.aiimage.common.exception.BusinessException;
import com.nanri.aiimage.common.service.CompanyScopeSupport;
import com.nanri.aiimage.modules.productcategory.mapper.ProductCategoryMapper;
import com.nanri.aiimage.modules.productcategory.model.dto.ProductCategorySaveRequest;
import com.nanri.aiimage.modules.productcategory.model.entity.ProductCategoryEntity;
@@ -34,63 +35,109 @@ public class ProductCategoryService {
private static final DateTimeFormatter EXPORT_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
private final ProductCategoryMapper productCategoryMapper;
/**
* 内置节点的哨兵归属(V147 回填):它不是公司表里的行,而是"所有公司都看得见、谁都不拥有"的那半棵树。
*
* <p>取 0 是因为 {@code company.id} 从 1 起自增,而 {@code CompanyScopeSupport.requireCompanyId}
* 对 {@code <= 0} 直接抛 ⇒ 没有任何账号会被登记成 0 号公司,这个值和真实公司永不撞。</p>
*/
static final long SHARED_BUILTIN_COMPANY_ID = 0L;
private final ProductCategoryMapper productCategoryMapper;
private final CompanyScopeSupport companyScopeSupport;
/**
* 全平台类目树——<b>不按公司筛,且不许改成按公司筛</b>。
*
* <p>唯一的消费者是货源/外观的类目归类({@code SimilarAsinLlmService:215 CategoryTree.load(list())})。
* 那一侧按公司切会同时改两件事:候选节点变少(分类结果按公司分叉)与 prompt 里的类目表变化(影响 LLM 成本)。
* 后台的公司 tab 走 {@link #list(String, Long)},两件事别混。</p>
*/
public ProductCategoryListVo list() {
return list(null);
}
/** 不筛公司(超管没选 tab 时的口径,与改造前一致)。 */
public ProductCategoryListVo list(String keyword) {
List<ProductCategoryEntity> rows = productCategoryMapper.selectList(new LambdaQueryWrapper<ProductCategoryEntity>()
.orderByAsc(ProductCategoryEntity::getParentId)
.orderByAsc(ProductCategoryEntity::getSortOrder)
.orderByAsc(ProductCategoryEntity::getId));
return list(keyword, null);
}
/**
* @param companyId 要收窄到的公司;null = 不筛。内置节点({@value #SHARED_BUILTIN_COMPANY_ID})
* 在任何公司的视图里都可见,否则第 2 家的类目树会是空的、连一个自建根都挂不上。
*/
public ProductCategoryListVo list(String keyword, Long companyId) {
List<ProductCategoryEntity> rows = productCategoryMapper.selectList(applyCompanyScope(
new LambdaQueryWrapper<ProductCategoryEntity>()
.orderByAsc(ProductCategoryEntity::getParentId)
.orderByAsc(ProductCategoryEntity::getSortOrder)
.orderByAsc(ProductCategoryEntity::getId),
companyId));
rows = filterRowsByKeyword(rows, keyword);
return buildListVo(rows);
}
public ProductCategoryListVo children(Long parentId, long page, long pageSize) {
return children(parentId, page, pageSize, null);
}
public ProductCategoryListVo children(Long parentId, long page, long pageSize, Long companyId) {
long safePage = Math.max(page, 1);
long safePageSize = normalizePageSize(pageSize);
Long normalizedParentId = normalizeParentId(parentId);
LambdaQueryWrapper<ProductCategoryEntity> countQuery = new LambdaQueryWrapper<>();
LambdaQueryWrapper<ProductCategoryEntity> countQuery = applyCompanyScope(new LambdaQueryWrapper<>(), companyId);
applyParentFilter(countQuery, normalizedParentId);
Long total = productCategoryMapper.selectCount(countQuery);
LambdaQueryWrapper<ProductCategoryEntity> pageQuery = new LambdaQueryWrapper<ProductCategoryEntity>()
.orderByAsc(ProductCategoryEntity::getSortOrder)
.orderByAsc(ProductCategoryEntity::getId)
LambdaQueryWrapper<ProductCategoryEntity> pageQuery = applyCompanyScope(
new LambdaQueryWrapper<ProductCategoryEntity>()
.orderByAsc(ProductCategoryEntity::getSortOrder)
.orderByAsc(ProductCategoryEntity::getId),
companyId)
.last("LIMIT " + ((safePage - 1) * safePageSize) + ", " + safePageSize);
applyParentFilter(pageQuery, normalizedParentId);
List<ProductCategoryEntity> rows = productCategoryMapper.selectList(pageQuery);
return buildPageVo(rows, total, safePage, safePageSize);
return buildPageVo(rows, total, safePage, safePageSize, companyId);
}
public ProductCategoryListVo search(String keyword, long page, long pageSize) {
return search(keyword, page, pageSize, null);
}
public ProductCategoryListVo search(String keyword, long page, long pageSize, Long companyId) {
String normalized = normalizeSearchKeyword(keyword);
if (normalized.isBlank()) {
return emptyPageVo(Math.max(page, 1), normalizePageSize(pageSize));
}
long safePage = Math.max(page, 1);
long safePageSize = normalizePageSize(pageSize);
LambdaQueryWrapper<ProductCategoryEntity> countQuery = buildSearchQuery(normalized);
Long total = productCategoryMapper.selectCount(countQuery);
List<ProductCategoryEntity> rows = productCategoryMapper.selectList(buildSearchQuery(normalized)
Long total = productCategoryMapper.selectCount(buildSearchQuery(normalized, companyId));
List<ProductCategoryEntity> rows = productCategoryMapper.selectList(buildSearchQuery(normalized, companyId)
.orderByAsc(ProductCategoryEntity::getParentId)
.orderByAsc(ProductCategoryEntity::getSortOrder)
.orderByAsc(ProductCategoryEntity::getId)
.last("LIMIT " + ((safePage - 1) * safePageSize) + ", " + safePageSize));
return buildSearchPageVo(rows, total, safePage, safePageSize);
return buildSearchPageVo(rows, total, safePage, safePageSize, companyId);
}
/**
* 归属由<b>操作者会话</b>推导(请求体/查询参数一律不带 company_id):漏了这一句,新类目就会被
* V147 的 {@code DEFAULT 1} 静默塞进厦门米椿花——那是"归属失真且不报错",而 {@code requireCompanyId}
* 取不到公司时是抛,不会返回 null。所以这里<b>不保留</b>不带操作者的重载:留着它等于留着一个
* "调用方忘了传也照样绿"的出口。
*
* @param operatorId 操作者账号 id
*/
@Transactional
public ProductCategoryItemVo create(ProductCategorySaveRequest request) {
public ProductCategoryItemVo create(ProductCategorySaveRequest request, Long operatorId) {
String name = normalizeRequired(request.getName(), "类目名称不能为空");
Long parentId = normalizeParentId(request.getParentId());
ensureParentExists(parentId, null);
ensureSiblingNameUnique(parentId, name, null);
Long companyId = companyScopeSupport.requireCompanyId(operatorId);
ensureParentVisible(parentId, null, companyId);
ensureSiblingNameUnique(parentId, name, null, companyId);
ProductCategoryEntity entity = new ProductCategoryEntity();
entity.setCompanyId(companyId);
entity.setParentId(parentId);
entity.setName(name);
entity.setCategoryKey(generateCategoryKey(parentId, name));
@@ -106,8 +153,11 @@ public class ProductCategoryService {
ProductCategoryEntity entity = getById(id);
String name = normalizeRequired(request.getName(), "类目名称不能为空");
Long parentId = normalizeParentId(request.getParentId());
ensureParentExists(parentId, id);
ensureSiblingNameUnique(parentId, name, id);
// 改行时" Acting 公司"取行自己的归属,不取 tab:内置行归 0、自建行归那一家,
// 换父级时不能把行挪到可见集外的节点下面(那会让它从原本看得见它的 tab 里消失)。
Long companyId = entity.getCompanyId();
ensureParentVisible(parentId, id, companyId);
ensureSiblingNameUnique(parentId, name, id, companyId);
entity.setParentId(parentId);
entity.setName(name);
@@ -163,8 +213,8 @@ public class ProductCategoryService {
return vo;
}
private ProductCategoryListVo buildPageVo(List<ProductCategoryEntity> rows, Long total, long page, long pageSize) {
Map<Long, Integer> childCountById = buildChildCountById(rows);
private ProductCategoryListVo buildPageVo(List<ProductCategoryEntity> rows, Long total, long page, long pageSize, Long companyId) {
Map<Long, Integer> childCountById = buildChildCountById(rows, companyId);
List<ProductCategoryItemVo> items = rows.stream()
.map(row -> toItemVo(row, childCountById.getOrDefault(row.getId(), 0)))
.toList();
@@ -178,8 +228,13 @@ public class ProductCategoryService {
return vo;
}
/** 导出的行集合必须与页面列表同源:都走 {@link #list(String, Long)},否则"tab 里看不见但导出里有"就是第二个真相源。 */
public byte[] export(String keyword) {
ProductCategoryListVo list = list(keyword);
return export(keyword, null);
}
public byte[] export(String keyword, Long companyId) {
ProductCategoryListVo list = list(keyword, companyId);
List<ProductCategoryItemVo> rows = list.getItems() == null ? List.of() : list.getItems();
Map<Long, String> nameById = buildExportNameById(rows);
try (SXSSFWorkbook workbook = new SXSSFWorkbook(100);
@@ -198,8 +253,8 @@ public class ProductCategoryService {
}
}
private ProductCategoryListVo buildSearchPageVo(List<ProductCategoryEntity> rows, Long total, long page, long pageSize) {
Map<Long, Integer> childCountById = buildChildCountById(rows);
private ProductCategoryListVo buildSearchPageVo(List<ProductCategoryEntity> rows, Long total, long page, long pageSize, Long companyId) {
Map<Long, Integer> childCountById = buildChildCountById(rows, companyId);
List<ProductCategoryItemVo> items = rows.stream()
.map(row -> {
ProductCategoryItemVo item = toItemVo(row, childCountById.getOrDefault(row.getId(), 0));
@@ -305,15 +360,23 @@ public class ProductCategoryService {
return time == null ? "" : time.format(EXPORT_TIME_FORMATTER);
}
private Map<Long, Integer> buildChildCountById(List<ProductCategoryEntity> rows) {
/**
* 列表页的「子类目数」徽章走的是<b>全表聚合</b>(不是内存里那批行),所以它必须和公司视图同源:
* 不加这一段,第 1 家的父节点上会显示"3 个子类目"而 tab 里只列得出一两个——
* 数字来自别人的公司,点开却是自己的树。
*/
private Map<Long, Integer> buildChildCountById(List<ProductCategoryEntity> rows, Long companyId) {
Map<Long, Integer> childCountById = new HashMap<>();
if (rows.isEmpty()) {
return childCountById;
}
List<Map<String, Object>> countRows = productCategoryMapper.selectMaps(new QueryWrapper<ProductCategoryEntity>()
QueryWrapper<ProductCategoryEntity> countQuery = new QueryWrapper<ProductCategoryEntity>()
.select("parent_id", "count(*) AS child_count")
.isNotNull("parent_id")
.groupBy("parent_id"));
.isNotNull("parent_id");
if (companyId != null) {
countQuery.in("company_id", visibleCompanyIds(companyId));
}
List<Map<String, Object>> countRows = productCategoryMapper.selectMaps(countQuery.groupBy("parent_id"));
for (Map<String, Object> countRow : countRows) {
Object parentId = countRow.get("parent_id");
Object childCount = countRow.get("child_count");
@@ -333,13 +396,40 @@ public class ProductCategoryService {
}
}
private LambdaQueryWrapper<ProductCategoryEntity> buildSearchQuery(String keyword) {
return new LambdaQueryWrapper<ProductCategoryEntity>()
.like(ProductCategoryEntity::getName, keyword)
.or()
.like(ProductCategoryEntity::getCategoryKey, keyword)
.or()
.like(ProductCategoryEntity::getDescription, keyword);
/**
* 关键字命中三条列任一即算命中,但<b>整条 OR 必须包起来再 AND 公司</b>:MyBatis-Plus 的
* {@code or()} 只改"下一个连接符",直接在这串后面 {@code .in(company_id, ...)} 会拼成
* {@code name LIKE ? OR key LIKE ? OR (desc LIKE ? AND company_id IN ...)} —— SQL 里 AND 结合更紧,
* 结果前两条列命中的行<b>不受公司约束</b>,这一页的筛选就成了假的(且不报错)。
*/
private LambdaQueryWrapper<ProductCategoryEntity> buildSearchQuery(String keyword, Long companyId) {
LambdaQueryWrapper<ProductCategoryEntity> query = new LambdaQueryWrapper<ProductCategoryEntity>()
.and(group -> group
.like(ProductCategoryEntity::getName, keyword)
.or()
.like(ProductCategoryEntity::getCategoryKey, keyword)
.or()
.like(ProductCategoryEntity::getDescription, keyword));
return applyCompanyScope(query, companyId);
}
/**
* 公司视图的唯一落点:null = 不筛(超管没选 tab、非超管、以及 {@link #list()} 那棵给 LLM 的全局树);
* 否则 {@code company_id IN (0, X)} —— 哨兵 0 那批内置节点在任何公司视图里都必须在,
* 不然第 2 家的类目页是一棵空树,它自建不出任何子级(父级只能挂在这批上面)。
*/
private LambdaQueryWrapper<ProductCategoryEntity> applyCompanyScope(
LambdaQueryWrapper<ProductCategoryEntity> query, Long companyId) {
if (companyId != null) {
query.in(ProductCategoryEntity::getCompanyId, visibleCompanyIds(companyId));
}
return query;
}
private List<Long> visibleCompanyIds(Long companyId) {
return companyId == SHARED_BUILTIN_COMPANY_ID
? List.of(SHARED_BUILTIN_COMPANY_ID)
: List.of(SHARED_BUILTIN_COMPANY_ID, companyId);
}
private List<ProductCategoryEntity> filterRowsByKeyword(List<ProductCategoryEntity> rows, String keyword) {
@@ -495,7 +585,14 @@ public class ProductCategoryService {
return entity;
}
private void ensureParentExists(Long parentId, Long currentId) {
/**
* 父级必须"存在且在这一公司的可见集里"。
*
* <p>只查存在性是不够的:把行的 parent_id 指到别家公司的节点上,这一行就从原本看得见它的
* tab 里消失(读侧按父级子树裁),而 {@code parent_id} 没有外键、库里一声不响。
* companyId 为 null 时不校验——那是改造前/内部调用的口径,不是"允许跨公司挂"。</p>
*/
private void ensureParentVisible(Long parentId, Long currentId, Long companyId) {
if (parentId == null) {
return;
}
@@ -506,6 +603,9 @@ public class ProductCategoryService {
if (parent == null) {
throw new BusinessException("父级类目不存在");
}
if (companyId != null && !visibleCompanyIds(companyId).contains(parent.getCompanyId())) {
throw new BusinessException(403, "父级类目不属于当前公司");
}
Set<Long> visited = new HashSet<>();
Long cursor = parent.getParentId();
while (cursor != null) {
@@ -520,9 +620,17 @@ public class ProductCategoryService {
}
}
private void ensureSiblingNameUnique(Long parentId, String name, Long excludeId) {
/**
* 同级重名检查的范围 = 这一家的<b>可见集</b>(自建 + 内置),不是只查自建。
*
* <p>只查自建会让第 2 家在内置父级"护肤品"下建出一个也叫"面霜"的节点,和内置的那个
* 同层同名——页面上一排两个"面霜",而货源归类按名字回填时不知道落到哪一个。
* 反过来,跨家的同名要放行:那正是 {@code uk_company_category_key} 换掉全平台唯一键要解决的问题。</p>
*/
private void ensureSiblingNameUnique(Long parentId, String name, Long excludeId, Long companyId) {
LambdaQueryWrapper<ProductCategoryEntity> query = new LambdaQueryWrapper<ProductCategoryEntity>()
.eq(ProductCategoryEntity::getName, name);
applyCompanyScope(query, companyId);
if (parentId == null) {
query.isNull(ProductCategoryEntity::getParentId);
} else {
@@ -6,10 +6,12 @@ import com.nanri.aiimage.common.util.DownloadHeaderUtil;
import com.nanri.aiimage.config.HttpClientPool;
import com.nanri.aiimage.common.security.AdminAuthSupport;
import com.nanri.aiimage.common.model.entity.AdminUserEntity;
import com.nanri.aiimage.common.service.DataReadScope;
import com.nanri.aiimage.modules.permission.service.PermissionMenuService;
import com.nanri.aiimage.modules.shopdatacrawl.model.dto.ShopDataCrawlDownloadRowDto;
import com.nanri.aiimage.modules.shopdatacrawl.service.ShopDataCrawlAdminTasksService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
@@ -76,6 +78,7 @@ public class AdminShopDataCrawlTasksController {
private final AdminAuthSupport adminAuthSupport;
private final PermissionMenuService permissionMenuService;
private final ShopDataCrawlAdminTasksService adminTasksService;
private final DataReadScope dataReadScope;
@GetMapping
@Operation(summary = "店铺数据抓取记录:按店铺分组分页列表(每店最新结果文件)")
@@ -87,13 +90,19 @@ public class AdminShopDataCrawlTasksController {
@RequestParam(name = "group_name", required = false) String groupName,
@RequestParam(name = "country", required = false) String country,
@RequestParam(name = "created_from", required = false) String createdFrom,
@RequestParam(name = "created_to", required = false) String createdTo) {
@RequestParam(name = "created_to", required = false) String createdTo,
@Parameter(description = "公司 ID") @RequestParam(name = "company_id", required = false) Long companyId) {
AdminUserEntity operator = requireShopDataCrawlTaskAccess(request);
int safePage = Math.max(1, parseInt(page, 1, "page 参数不合法"));
int safePageSize = Math.min(PAGE_SIZE_MAX,
Math.max(10, parseInt(pageSize, PAGE_SIZE_DEFAULT, "page_size 参数不合法")));
boolean superAdmin = "super_admin".equals(adminAuthSupport.currentRole(operator));
List<String> visibleShopKeys = superAdmin ? null : resolveVisibleShopNameKeys(operator.getId());
// 成员集就地算,且只在超管这一支算(口径同最低价ASIN/查询ASIN);null = 不筛=今天的超管全量。
List<Long> companyMemberIds = superAdmin
? dataReadScope.readScope(operator, companyId).userIdsOr(null)
: null;
List<String> visibleShopKeys = adminTasksService.resolveVisibleShopKeys(
operator.getId(), superAdmin, companyMemberIds);
Map<String, Object> payload = adminTasksService.listShopGroups(
safePage, safePageSize, shopName, groupName, country, createdFrom, createdTo, visibleShopKeys);
return ApiResponse.success(payload);
@@ -282,11 +291,6 @@ public class AdminShopDataCrawlTasksController {
return operator;
}
/** 非超管返回其可管店铺名(trim+小写去重,与撞款可见口径一致);超管调用方传 null 表示全量。 */
private List<String> resolveVisibleShopNameKeys(Long operatorId) {
return adminTasksService.resolveVisibleShopNameKeys(operatorId);
}
private AdminUserEntity resolveInternalOperator(HttpServletRequest request) {
String suppliedToken = request.getHeader("X-Internal-Token");
if (!isTrustedInternalRequest(suppliedToken)) {
@@ -222,9 +222,26 @@ public class ShopDataCrawlAdminTasksService {
return rows;
}
/** 非超管可管店铺名(trim+小写去重,与撞款可见口径一致);超管调用方传 null 表示全量。 */
public List<String> resolveVisibleShopNameKeys(Long operatorId) {
List<String> names = managedShopNamesPort.selectManagedShopNames(operatorId);
/**
* 可见店铺名 key 集(trim+小写去重,与撞款页口径一致);返回 {@code null} 表示全量。
*
* <p>公司条件只在超管这一支生效({@code companyMemberIds} 由 controller 经 {@code DataReadScope} 算好传入),
* 非超管一律按分组关系推——他在这一页看到的范围不随 tab 变化,这条与撞款页逐字一致,
* 也与 {@code ShopManageService.page} 的注释同源:给非超管叠 created_by IN 成员会把
* 「只挂了 user_id 的分组」那批店铺静默删掉。</p>
*/
public List<String> resolveVisibleShopKeys(Long operatorId, boolean superAdmin, List<Long> companyMemberIds) {
if (!superAdmin) {
return shopNameKeys(managedShopNamesPort.selectManagedShopNames(operatorId));
}
if (companyMemberIds == null) {
return null;
}
// 端口对空成员集返回空列表 ⇒ 这里自然得到空列表("这家没有店铺"),不会退化成 null("全量")。
return shopNameKeys(managedShopNamesPort.selectShopNamesOwnedByMembers(companyMemberIds));
}
private static List<String> shopNameKeys(List<String> names) {
if (names == null || names.isEmpty()) {
return List.of();
}
@@ -11,4 +11,12 @@ public interface ManagedShopNamesPort {
/** 该操作人可管的店铺名;传 null 表示全量(超管调用方)。 */
List<String> selectManagedShopNames(Long operatorId);
/**
* 某家公司的店铺名(按店铺行自己的负责人推,口径同「店铺管理」页的公司 tab)。
*
* <p>空成员集必须由调用方挡住:这条是给「切到第 2 家」用的,成员为空=这家公司一家店铺都没有,
* 该返回空集合(页面显示"没有店铺"),而不是把空 IN 丢进 SQL。</p>
*/
List<String> selectShopNamesOwnedByMembers(List<Long> memberIds);
}
@@ -5,12 +5,14 @@ import com.nanri.aiimage.common.exception.BusinessException;
import com.nanri.aiimage.common.util.DownloadHeaderUtil;
import com.nanri.aiimage.common.security.AdminAuthSupport;
import com.nanri.aiimage.common.model.entity.AdminUserEntity;
import com.nanri.aiimage.common.service.DataReadScope;
import com.nanri.aiimage.modules.permission.service.PermissionMenuService;
import com.nanri.aiimage.modules.shopduplicatecheck.service.ShopDataDuplicateCheckImportService;
import com.nanri.aiimage.modules.shopduplicatecheck.service.ShopDataDuplicateCheckQueryService;
import com.nanri.aiimage.modules.shopduplicatecheck.service.ShopDataDuplicateCheckScanService;
import com.nanri.aiimage.modules.shopduplicatecheck.service.ShopDataDuplicateCheckScanService.DuplicateScanView;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
@@ -30,6 +32,7 @@ import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
import java.security.MessageDigest;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -51,12 +54,14 @@ public class AdminShopDataDuplicateCheckController {
private final ShopDataDuplicateCheckScanService scanService;
private final ShopDataDuplicateCheckQueryService queryService;
private final ShopDataDuplicateCheckImportService importService;
private final DataReadScope dataReadScope;
@GetMapping("/duplicate-check-overview")
@Operation(summary = "撞款指标与店铺分布(force=1 触发同步重扫)")
public ApiResponse<Object> overview(
HttpServletRequest request,
@RequestParam(name = "force", required = false) String force) {
@RequestParam(name = "force", required = false) String force,
@Parameter(description = "公司 ID") @RequestParam(name = "company_id", required = false) Long companyId) {
RequestOperator operator = requireDuplicateCheckAccess(request);
boolean forced = force != null && ("1".equals(force.trim().toLowerCase())
|| "true".equals(force.trim().toLowerCase()) || "yes".equals(force.trim().toLowerCase()));
@@ -68,7 +73,11 @@ public class AdminShopDataDuplicateCheckController {
if (view == null) {
return ApiResponse.success(queryService.pendingOverview());
}
Set<String> visibleKeys = queryService.resolveVisibleShopKeys(operator.id(), operator.superAdmin());
List<Long> companyMemberIds = operator.superAdmin()
? dataReadScope.readScope(operator.user(), companyId).userIdsOr(null)
: null;
Set<String> visibleKeys = queryService.resolveVisibleShopKeys(
operator.id(), operator.superAdmin(), companyMemberIds);
return ApiResponse.success(queryService.overviewData(view, visibleKeys));
}
@@ -84,7 +93,8 @@ public class AdminShopDataDuplicateCheckController {
@RequestParam(name = "country", required = false) String country,
@RequestParam(name = "site", required = false) String site,
@RequestParam(name = "date_from", required = false) String dateFrom,
@RequestParam(name = "date_to", required = false) String dateTo) {
@RequestParam(name = "date_to", required = false) String dateTo,
@Parameter(description = "公司 ID") @RequestParam(name = "company_id", required = false) Long companyId) {
RequestOperator operator = requireDuplicateCheckAccess(request);
int safePage = parsePage(page);
int safeSize = clamp(parseSize(pageSize, 20), 10, 100);
@@ -95,7 +105,11 @@ public class AdminShopDataDuplicateCheckController {
if (scan == null) {
return ApiResponse.success(queryService.pendingList(safePage, safeSize));
}
Set<String> visibleKeys = queryService.resolveVisibleShopKeys(operator.id(), operator.superAdmin());
List<Long> companyMemberIds = operator.superAdmin()
? dataReadScope.readScope(operator.user(), companyId).userIdsOr(null)
: null;
Set<String> visibleKeys = queryService.resolveVisibleShopKeys(
operator.id(), operator.superAdmin(), companyMemberIds);
return ApiResponse.success(queryService.itemsData(scan, visibleKeys, safePage, safeSize, viewMode, filters));
}
@@ -110,7 +124,8 @@ public class AdminShopDataDuplicateCheckController {
@RequestParam(name = "country", required = false) String country,
@RequestParam(name = "site", required = false) String site,
@RequestParam(name = "date_from", required = false) String dateFrom,
@RequestParam(name = "date_to", required = false) String dateTo) {
@RequestParam(name = "date_to", required = false) String dateTo,
@Parameter(description = "公司 ID") @RequestParam(name = "company_id", required = false) Long companyId) {
RequestOperator operator = requireDuplicateCheckAccess(request);
int safePage = parsePage(page);
int safeSize = clamp(parseSize(pageSize, 6), 1, 24);
@@ -120,7 +135,11 @@ public class AdminShopDataDuplicateCheckController {
if (scan == null) {
return ApiResponse.success(queryService.pendingDetail(safePage, safeSize));
}
Set<String> visibleKeys = queryService.resolveVisibleShopKeys(operator.id(), operator.superAdmin());
List<Long> companyMemberIds = operator.superAdmin()
? dataReadScope.readScope(operator.user(), companyId).userIdsOr(null)
: null;
Set<String> visibleKeys = queryService.resolveVisibleShopKeys(
operator.id(), operator.superAdmin(), companyMemberIds);
return ApiResponse.success(queryService.detailData(scan, visibleKeys, safePage, safeSize, filters));
}
@@ -134,7 +153,8 @@ public class AdminShopDataDuplicateCheckController {
@RequestParam(name = "country", required = false) String country,
@RequestParam(name = "site", required = false) String site,
@RequestParam(name = "date_from", required = false) String dateFrom,
@RequestParam(name = "date_to", required = false) String dateTo) {
@RequestParam(name = "date_to", required = false) String dateTo,
@Parameter(description = "公司 ID") @RequestParam(name = "company_id", required = false) Long companyId) {
RequestOperator operator = requireDuplicateCheckAccess(request);
ShopDataDuplicateCheckQueryService.Filters filters =
ShopDataDuplicateCheckQueryService.Filters.clean(asin, shopName, country, site, dateFrom, dateTo);
@@ -142,7 +162,11 @@ public class AdminShopDataDuplicateCheckController {
if (scan == null) {
return ApiResponse.success(queryService.pendingConsole());
}
Set<String> visibleKeys = queryService.resolveVisibleShopKeys(operator.id(), operator.superAdmin());
List<Long> companyMemberIds = operator.superAdmin()
? dataReadScope.readScope(operator.user(), companyId).userIdsOr(null)
: null;
Set<String> visibleKeys = queryService.resolveVisibleShopKeys(
operator.id(), operator.superAdmin(), companyMemberIds);
Set<String> effectiveKeys = queryService.withGroupFilter(visibleKeys, scan, group);
return ApiResponse.success(queryService.consoleData(scan, effectiveKeys, filters));
}
@@ -161,7 +185,8 @@ public class AdminShopDataDuplicateCheckController {
@RequestParam(name = "country", required = false) String country,
@RequestParam(name = "site", required = false) String site,
@RequestParam(name = "date_from", required = false) String dateFrom,
@RequestParam(name = "date_to", required = false) String dateTo) {
@RequestParam(name = "date_to", required = false) String dateTo,
@Parameter(description = "公司 ID") @RequestParam(name = "company_id", required = false) Long companyId) {
RequestOperator operator = requireDuplicateCheckAccess(request);
int safePage = parsePage(page);
int safeSize = clamp(parseSize(pageSize, 100), 1, 200);
@@ -171,7 +196,11 @@ public class AdminShopDataDuplicateCheckController {
if (scan == null) {
return ApiResponse.success(queryService.pendingLedger(safePage, safeSize));
}
Set<String> visibleKeys = queryService.resolveVisibleShopKeys(operator.id(), operator.superAdmin());
List<Long> companyMemberIds = operator.superAdmin()
? dataReadScope.readScope(operator.user(), companyId).userIdsOr(null)
: null;
Set<String> visibleKeys = queryService.resolveVisibleShopKeys(
operator.id(), operator.superAdmin(), companyMemberIds);
Set<String> effectiveKeys = queryService.withGroupFilter(visibleKeys, scan, group);
return ApiResponse.success(queryService.ledgerData(scan, effectiveKeys, safePage, safeSize, sortKey, sortDir, filters));
}
@@ -187,7 +216,8 @@ public class AdminShopDataDuplicateCheckController {
@RequestParam(name = "country", required = false) String country,
@RequestParam(name = "site", required = false) String site,
@RequestParam(name = "date_from", required = false) String dateFrom,
@RequestParam(name = "date_to", required = false) String dateTo) {
@RequestParam(name = "date_to", required = false) String dateTo,
@Parameter(description = "公司 ID") @RequestParam(name = "company_id", required = false) Long companyId) {
RequestOperator operator = requireDuplicateCheckAccess(request);
DuplicateScanView scan = scanService.loadLatest();
if (scan == null) {
@@ -196,7 +226,11 @@ public class AdminShopDataDuplicateCheckController {
String viewMode = view == null ? "monitor" : view.trim().toLowerCase();
ShopDataDuplicateCheckQueryService.Filters filters =
ShopDataDuplicateCheckQueryService.Filters.clean(asin, shopName, country, site, dateFrom, dateTo);
Set<String> visibleKeys = queryService.resolveVisibleShopKeys(operator.id(), operator.superAdmin());
List<Long> companyMemberIds = operator.superAdmin()
? dataReadScope.readScope(operator.user(), companyId).userIdsOr(null)
: null;
Set<String> visibleKeys = queryService.resolveVisibleShopKeys(
operator.id(), operator.superAdmin(), companyMemberIds);
try {
response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
DownloadHeaderUtil.setAttachment(response, "shop-data-duplicate-check.xlsx");
@@ -241,7 +275,15 @@ public class AdminShopDataDuplicateCheckController {
}
}
private record RequestOperator(Long id, boolean superAdmin) {
/**
* 带上操作者实体:{@code DataReadScope.readScope} 只认 {@code AdminUserEntity}(它要读这一行的
* company_id 和角色),而 G2 护栏要求 {@code readScope(} 落在<b>每支 handler 体内</b>(私有收口方法
* 不算证据——那一支可以整批不接出口还跟着别人的绿),所以成员集只能就地算。
*/
private record RequestOperator(AdminUserEntity user, boolean superAdmin) {
Long id() {
return user.getId();
}
}
private RequestOperator requireDuplicateCheckAccess(HttpServletRequest request) {
@@ -256,7 +298,7 @@ public class AdminShopDataDuplicateCheckController {
}
permissionMenuService.requireShopDataCrawlTaskAccess(operator);
boolean superAdmin = "super_admin".equals(adminAuthSupport.currentRole(operator));
return new RequestOperator(operator.getId(), superAdmin);
return new RequestOperator(operator, superAdmin);
}
private AdminUserEntity resolveInternalOperator(HttpServletRequest request) {
@@ -96,4 +96,25 @@ public interface ShopDuplicateCheckSourceMapper {
)
""")
List<String> selectManagedShopNames(@Param("operatorId") Long operatorId);
/**
* 公司 tab 的店铺名集:按店铺自己的负责人({@code biz_shop_manage.created_by_id})落在这批成员里推。
*
* <p>口径与「店铺管理」页 {@code ShopManageService.page} 的 companyMemberIds 那一段逐字同一把尺子:
* 同一个 tab 在店铺中心的两页上推出两个不同的店铺集合,比看到空页更糟(后者至少不会骗人)。
* 这里【不】走 {@code listCompanyGroupIds} 那条分组归属路线——分组归属认 created_by_id 与 user_id 两列,
* 而店铺管理页只认店铺行的 created_by_id;跟着已上线那页走,才不会出现「店铺管理看不到、撞款看得到」。</p>
*
* <p>空成员集不在这条 SQL 里兜:IN () 是语法错,调用方必须在 memberIds 为空时直接给空集合。</p>
*/
@Select("""
<script>
SELECT DISTINCT TRIM(sm.shop_name)
FROM biz_shop_manage sm
WHERE TRIM(COALESCE(sm.shop_name, '')) &lt;&gt; ''
AND sm.created_by_id IN
<foreach collection="memberIds" item="mid" open="(" separator="," close=")">#{mid}</foreach>
</script>
""")
List<String> selectShopNamesOwnedBy(@Param("memberIds") List<Long> memberIds);
}
@@ -20,4 +20,12 @@ public class ManagedShopNamesPortAdapter implements ManagedShopNamesPort {
public List<String> selectManagedShopNames(Long operatorId) {
return sourceMapper.selectManagedShopNames(operatorId);
}
@Override
public List<String> selectShopNamesOwnedByMembers(List<Long> memberIds) {
if (memberIds == null || memberIds.isEmpty()) {
return List.of();
}
return sourceMapper.selectShopNamesOwnedBy(memberIds);
}
}
@@ -74,13 +74,34 @@ public class ShopDataDuplicateCheckQueryService {
return (shopName == null ? "" : shopName.trim()).toLowerCase(Locale.ROOT);
}
/** 主管可见店铺 key 集;超管用 null 表示全量。 */
public Set<String> resolveVisibleShopKeys(Long operatorId, boolean superAdmin) {
if (superAdmin) {
/**
* 可见店铺 key 集;{@code null} = 全量(超管没切公司 tab 时的今天)。
*
* <p>{@code companyMemberIds} 只在超管这一支由 controller 算好传入(非超管一律 null:他的范围本来就锁在
* 分组关系上,叠一层 created_by IN 成员会把「只挂了 user_id 的分组」下的店铺整批静默删掉——
* 口径与「店铺管理/查询ASIN/最低价ASIN」三页逐字一致)。tab 是视图开关,不是安全边界。</p>
*
* <p><b>公司 tab 下的可见集是「店铺表里有、且负责人属于这家公司」的店铺</b>:扫描结果里那些
* 没登记进 biz_shop_manage 的店铺名(历史上传文件留下的)在任何公司 tab 下都不出现,
* 只有回到「全部」才看得到。这是按负责人推归属的必然代价,不是筛选坏了。</p>
*/
public Set<String> resolveVisibleShopKeys(Long operatorId, boolean superAdmin, List<Long> companyMemberIds) {
if (!superAdmin) {
return shopKeys(sourceMapper.selectManagedShopNames(operatorId));
}
if (companyMemberIds == null) {
return null;
}
// 空成员集=这家公司一个账号都没有=一家店铺都没有:必须给空集合(页面显示"没有店铺"),
// 绝不能退化成 null——null 在这里是"全量",会让第 2 家看到全部数据。
return companyMemberIds.isEmpty()
? new LinkedHashSet<>()
: shopKeys(sourceMapper.selectShopNamesOwnedBy(companyMemberIds));
}
private static Set<String> shopKeys(List<String> names) {
Set<String> keys = new LinkedHashSet<>();
for (String name : sourceMapper.selectManagedShopNames(operatorId)) {
for (String name : names) {
if (name != null && !name.isBlank()) {
keys.add(shopKey(name));
}
@@ -44,6 +44,7 @@ public class QueryAsinController {
private final QueryAsinService queryAsinService;
private final AdminAuthSupport adminAuthSupport;
private final com.nanri.aiimage.common.service.DataReadScope dataReadScope;
/** 解析当前操作者(JWT 或内部令牌通道),权限与数据范围一律以该身份为准。 */
private AdminUserEntity requireOperator(HttpServletRequest request) {
@@ -51,7 +52,7 @@ public class QueryAsinController {
}
@GetMapping
@Operation(summary = "分页查询 ASIN")
@Operation(summary = "分页查询 ASIN", description = "company_id 只收窄可见集、不放大,跨公司查看仅超管")
public ApiResponse<QueryAsinPageVo> page(
HttpServletRequest request,
@Parameter(description = "页码") @RequestParam(name = "page", defaultValue = "1") Long page,
@@ -59,8 +60,14 @@ public class QueryAsinController {
@Parameter(description = "分组ID") @RequestParam(name = "group_id", required = false) Long groupId,
@Parameter(description = "店铺名") @RequestParam(name = "shop_name", required = false) String shopName,
@Parameter(description = "商品 ASIN") @RequestParam(name = "asin", required = false) String asin,
@Parameter(description = "国家代码(DE/UK/FR/IT/ES)") @RequestParam(name = "country", required = false) String country) {
@Parameter(description = "国家代码(DE/UK/FR/IT/ES)") @RequestParam(name = "country", required = false) String country,
@Parameter(description = "公司 ID") @RequestParam(name = "company_id", required = false) Long companyId) {
AdminUserEntity operator = requireOperator(request);
// 成员集就地算,且只在超管这一支算(非超管靠分组关系推,叠 created_by_id IN 成员会把
// 「只挂了 user_id 的分组」那批行从每个 tab 里静默删掉——口径与店铺管理逐字一致)。
java.util.List<Long> memberIds = isSuper(operator)
? dataReadScope.readScope(operator, companyId).userIdsOr(null)
: null;
return ApiResponse.success(queryAsinService.page(
page,
pageSize,
@@ -69,20 +76,25 @@ public class QueryAsinController {
asin,
country,
operator.getId(),
isSuper(operator)));
isSuper(operator),
memberIds));
}
@GetMapping("/export")
@Operation(summary = "导出查询 ASIN")
@Operation(summary = "导出查询 ASIN", description = "导出与列表同一个 company_id 范围,否则 tab 筛了表格、导出全量=越权泄露")
public ResponseEntity<byte[]> export(
HttpServletRequest request,
@Parameter(description = "分组ID") @RequestParam(name = "group_id", required = false) Long groupId,
@Parameter(description = "店铺名") @RequestParam(name = "shop_name", required = false) String shopName,
@Parameter(description = "商品 ASIN") @RequestParam(name = "asin", required = false) String asin,
@Parameter(description = "国家代码(DE/UK/FR/IT/ES)") @RequestParam(name = "country", required = false) String country) {
@Parameter(description = "国家代码(DE/UK/FR/IT/ES)") @RequestParam(name = "country", required = false) String country,
@Parameter(description = "公司 ID") @RequestParam(name = "company_id", required = false) Long companyId) {
AdminUserEntity operator = requireOperator(request);
java.util.List<Long> memberIds = isSuper(operator)
? dataReadScope.readScope(operator, companyId).userIdsOr(null)
: null;
byte[] bytes = queryAsinService.export(groupId, shopName, asin, country,
operator.getId(), isSuper(operator));
operator.getId(), isSuper(operator), memberIds);
String filename = "query-asin-" + LocalDateTime.now().format(EXPORT_FILENAME_FORMATTER) + ".xlsx";
return ResponseEntity.ok()
.header(HttpHeaders.CONTENT_DISPOSITION, DownloadHeaderUtil.contentDisposition(filename))
@@ -45,6 +45,7 @@ public class SkipPriceAsinController {
private final SkipPriceAsinService skipPriceAsinService;
private final AdminAuthSupport adminAuthSupport;
private final com.nanri.aiimage.common.service.DataReadScope dataReadScope;
/** 解析当前操作者(JWT 或内部令牌通道),权限与数据范围一律以该身份为准。 */
private AdminUserEntity requireOperator(HttpServletRequest request) {
@@ -62,8 +63,14 @@ public class SkipPriceAsinController {
@Parameter(description = "商品 ASIN") @RequestParam(name = "asin", required = false) String asin,
@Parameter(description = "国家代码(DE/UK/FR/IT/ES)") @RequestParam(name = "country", required = false) String country,
@Parameter(description = "最低价下限") @RequestParam(name = "minimum_price_from", required = false) BigDecimal minimumPriceFrom,
@Parameter(description = "最低价上限") @RequestParam(name = "minimum_price_to", required = false) BigDecimal minimumPriceTo) {
@Parameter(description = "最低价上限") @RequestParam(name = "minimum_price_to", required = false) BigDecimal minimumPriceTo,
@Parameter(description = "公司 ID") @RequestParam(name = "company_id", required = false) Long companyId) {
AdminUserEntity operator = requireOperator(request);
// 成员集就地算,且只在超管这一支算(非超管靠分组关系推,叠 created_by_id IN 成员会把
// 「只挂了 user_id 的分组」那批行从每个 tab 里静默删掉——口径与店铺管理逐字一致)。
java.util.List<Long> memberIds = isSuper(operator)
? dataReadScope.readScope(operator, companyId).userIdsOr(null)
: null;
return ApiResponse.success(skipPriceAsinService.page(
page,
pageSize,
@@ -74,7 +81,8 @@ public class SkipPriceAsinController {
minimumPriceFrom,
minimumPriceTo,
operator.getId(),
isSuper(operator)));
isSuper(operator),
memberIds));
}
@GetMapping("/export")
@@ -86,10 +94,14 @@ public class SkipPriceAsinController {
@Parameter(description = "商品 ASIN") @RequestParam(name = "asin", required = false) String asin,
@Parameter(description = "国家代码(DE/UK/FR/IT/ES)") @RequestParam(name = "country", required = false) String country,
@Parameter(description = "最低价下限") @RequestParam(name = "minimum_price_from", required = false) BigDecimal minimumPriceFrom,
@Parameter(description = "最低价上限") @RequestParam(name = "minimum_price_to", required = false) BigDecimal minimumPriceTo) {
@Parameter(description = "最低价上限") @RequestParam(name = "minimum_price_to", required = false) BigDecimal minimumPriceTo,
@Parameter(description = "公司 ID") @RequestParam(name = "company_id", required = false) Long companyId) {
AdminUserEntity operator = requireOperator(request);
java.util.List<Long> memberIds = isSuper(operator)
? dataReadScope.readScope(operator, companyId).userIdsOr(null)
: null;
byte[] bytes = skipPriceAsinService.export(groupId, shopName, asin, country, minimumPriceFrom, minimumPriceTo,
operator.getId(), isSuper(operator));
operator.getId(), isSuper(operator), memberIds);
String filename = "skip-price-asin-" + LocalDateTime.now().format(EXPORT_FILENAME_FORMATTER) + ".xlsx";
return ResponseEntity.ok()
.header(HttpHeaders.CONTENT_DISPOSITION, DownloadHeaderUtil.contentDisposition(filename))
@@ -95,10 +95,10 @@ public class QueryAsinService {
private static final java.time.Duration IMPORT_STATE_TTL = java.time.Duration.ofHours(3);
public QueryAsinPageVo page(long page, long pageSize, Long groupId, String shopName, String asin,
String country, Long operatorId, boolean superAdmin) {
String country, Long operatorId, boolean superAdmin, List<Long> companyMemberIds) {
long safePage = Math.max(page, 1);
long safePageSize = Math.min(Math.max(pageSize, 1), 100);
Long total = countFilteredRows(groupId, shopName, asin, country, operatorId, superAdmin);
Long total = countFilteredRows(groupId, shopName, asin, country, operatorId, superAdmin, companyMemberIds);
List<QueryAsinEntity> rows = listFilteredRows(
groupId,
shopName,
@@ -106,6 +106,7 @@ public class QueryAsinService {
country,
operatorId,
superAdmin,
companyMemberIds,
(safePage - 1) * safePageSize,
safePageSize);
@@ -123,12 +124,14 @@ public class QueryAsinService {
return vo;
}
public byte[] export(Long groupId, String shopName, String asin, String country, Long operatorId, boolean superAdmin) {
Long total = countFilteredRows(groupId, shopName, asin, country, operatorId, superAdmin);
public byte[] export(Long groupId, String shopName, String asin, String country, Long operatorId,
boolean superAdmin, List<Long> companyMemberIds) {
Long total = countFilteredRows(groupId, shopName, asin, country, operatorId, superAdmin, companyMemberIds);
if (total != null && total > MAX_EXPORT_ROWS) {
throw new BusinessException("导出数据超过上限 " + MAX_EXPORT_ROWS + " 行,请缩小筛选范围");
}
List<QueryAsinEntity> rows = listFilteredRows(groupId, shopName, asin, country, operatorId, superAdmin, null, null);
List<QueryAsinEntity> rows = listFilteredRows(groupId, shopName, asin, country, operatorId, superAdmin,
companyMemberIds, null, null);
Map<Long, String> groupNameById = shopManageGroupService.buildGroupNameMap(rows.stream()
.map(QueryAsinEntity::getGroupId)
.filter(id -> id != null && id > 0)
@@ -150,26 +153,30 @@ public class QueryAsinService {
}
}
private Long countFilteredRows(Long groupId, String shopName, String asin, String country, Long operatorId, boolean superAdmin) {
return queryAsinMapper.selectCount(buildFilterQuery(groupId, shopName, asin, country, operatorId, superAdmin));
private Long countFilteredRows(Long groupId, String shopName, String asin, String country, Long operatorId,
boolean superAdmin, List<Long> companyMemberIds) {
return queryAsinMapper.selectCount(
buildFilterQuery(groupId, shopName, asin, country, operatorId, superAdmin, companyMemberIds));
}
private List<QueryAsinEntity> listFilteredRows(Long groupId, String shopName, String asin, String country,
Long operatorId, boolean superAdmin,
Long operatorId, boolean superAdmin, List<Long> companyMemberIds,
Long offset, Long limit) {
LambdaQueryWrapper<QueryAsinEntity> query = buildFilterQuery(groupId, shopName, asin, country, operatorId, superAdmin);
LambdaQueryWrapper<QueryAsinEntity> query = buildFilterQuery(
groupId, shopName, asin, country, operatorId, superAdmin, companyMemberIds);
if (offset != null && limit != null) {
query.last("LIMIT " + Math.max(0L, offset) + ", " + Math.max(1L, limit));
}
return queryAsinMapper.selectList(query);
}
private LambdaQueryWrapper<QueryAsinEntity> buildFilterQuery(Long groupId, String shopName, String asin, String country,
Long operatorId, boolean superAdmin) {
private LambdaQueryWrapper<QueryAsinEntity> buildFilterQuery(Long groupId, String shopName, String asin,
String country, Long operatorId, boolean superAdmin,
List<Long> companyMemberIds) {
String safeShopName = normalizeBlank(shopName);
String safeAsin = normalizeBlank(asin);
String safeCountry = normalizeBlank(country).toUpperCase(Locale.ROOT);
Set<Long> accessibleGroupIds = superAdmin ? Set.of() : shopManageGroupService.listAccessibleGroupIds(operatorId, false);
Set<Long> visibleGroupIds = visibleGroupIds(operatorId, superAdmin, companyMemberIds);
LambdaQueryWrapper<QueryAsinEntity> query = new LambdaQueryWrapper<QueryAsinEntity>()
.eq(groupId != null && groupId > 0, QueryAsinEntity::getGroupId, groupId)
.like(!safeShopName.isEmpty(), QueryAsinEntity::getShopName, safeShopName)
@@ -190,16 +197,36 @@ public class QueryAsinService {
SFunction<QueryAsinEntity, ?> countryColumn = queryAsinCountryColumn(safeCountry);
query.isNotNull(countryColumn).ne(countryColumn, "");
}
if (!superAdmin) {
if (accessibleGroupIds.isEmpty()) {
// null = 不筛(超管没选公司,与今天逐字一致);空集 = 这一档公司一行都不该出现,用恒不成立的 id 兜住。
if (visibleGroupIds != null) {
if (visibleGroupIds.isEmpty()) {
query.eq(QueryAsinEntity::getId, -1L);
} else {
query.in(QueryAsinEntity::getGroupId, accessibleGroupIds);
query.in(QueryAsinEntity::getGroupId, visibleGroupIds);
}
}
return query;
}
/**
* 这一页能看哪些分组:非超管沿用既有可见集,公司 tab 只**收窄**它、不放大
* (放大等于把操作员本来看不到的分组端出来,比少看更坏)。
*
* @return null = 不筛分组
*/
private Set<Long> visibleGroupIds(Long operatorId, boolean superAdmin, List<Long> companyMemberIds) {
if (companyMemberIds == null) {
return superAdmin ? null : shopManageGroupService.listAccessibleGroupIds(operatorId, false);
}
Set<Long> companyGroupIds = shopManageGroupService.listCompanyGroupIds(companyMemberIds);
if (superAdmin) {
return companyGroupIds;
}
Set<Long> narrowed = new java.util.LinkedHashSet<>(shopManageGroupService.listAccessibleGroupIds(operatorId, false));
narrowed.retainAll(companyGroupIds);
return narrowed;
}
private SFunction<QueryAsinEntity, ?> queryAsinCountryColumn(String country) {
return switch (country) {
case "DE" -> QueryAsinEntity::getAsinDe;
@@ -97,6 +97,30 @@ public class ShopManageGroupService {
.collect(Collectors.toCollection(LinkedHashSet::new));
}
/**
* 属于这批账号的分组 id——公司 tab 在「只有 group_id、没有账号列」的表上推归属的唯一口径。
*
* <p><b>必须两列一起认</b>:生产 12 个分组里 10 个只有 {@code created_by_id},另外 2 个
* (周丽娥 id=2 / 郭亚芳 id=3)只有 {@code user_id}。只按 {@code created_by_id} 筛会把这 2 个分组
* 从每一个 tab 里静默删掉(不报错、不 403),而它们下面挂着 查询ASIN 4,525 行中的 4,512 行、
* 最低价ASIN 30,963 行中的 29,229 行——那会让「切到本公司」看起来像数据被删了 99%。</p>
*/
public Set<Long> listCompanyGroupIds(List<Long> companyMemberIds) {
if (companyMemberIds == null || companyMemberIds.isEmpty()) {
return Set.of();
}
return groupMapper.selectList(new LambdaQueryWrapper<ShopManageGroupEntity>()
.select(ShopManageGroupEntity::getId)
// 自成一组:MP 会给 and() 补最外层括号,这里再嵌一层 or 才不会让
// created_by_id 那半边逃出公司条件(AND 优先)。
.and(w -> w.in(ShopManageGroupEntity::getCreatedById, companyMemberIds)
.or(x -> x.in(ShopManageGroupEntity::getUserId, companyMemberIds))))
.stream()
.map(ShopManageGroupEntity::getId)
.filter(id -> id != null && id > 0)
.collect(Collectors.toCollection(LinkedHashSet::new));
}
public Set<Long> listAccessibleCreatorUserIds(Long operatorId, boolean superAdmin) {
if (superAdmin) {
return Set.of();
@@ -97,10 +97,11 @@ public class SkipPriceAsinService {
public SkipPriceAsinPageVo page(long page, long pageSize, Long groupId, String shopName, String asin,
String country, BigDecimal minimumPriceFrom, BigDecimal minimumPriceTo,
Long operatorId, boolean superAdmin) {
Long operatorId, boolean superAdmin, List<Long> companyMemberIds) {
long safePage = Math.max(page, 1);
long safePageSize = Math.min(Math.max(pageSize, 1), 100);
Long total = countFilteredRows(groupId, shopName, asin, country, minimumPriceFrom, minimumPriceTo, operatorId, superAdmin);
Long total = countFilteredRows(groupId, shopName, asin, country, minimumPriceFrom, minimumPriceTo,
operatorId, superAdmin, companyMemberIds);
List<SkipPriceAsinEntity> rows = listFilteredRows(
groupId,
shopName,
@@ -110,6 +111,7 @@ public class SkipPriceAsinService {
minimumPriceTo,
operatorId,
superAdmin,
companyMemberIds,
(safePage - 1) * safePageSize,
safePageSize);
@@ -129,13 +131,14 @@ public class SkipPriceAsinService {
public byte[] export(Long groupId, String shopName, String asin, String country,
BigDecimal minimumPriceFrom, BigDecimal minimumPriceTo,
Long operatorId, boolean superAdmin) {
Long total = countFilteredRows(groupId, shopName, asin, country, minimumPriceFrom, minimumPriceTo, operatorId, superAdmin);
Long operatorId, boolean superAdmin, List<Long> companyMemberIds) {
Long total = countFilteredRows(groupId, shopName, asin, country, minimumPriceFrom, minimumPriceTo,
operatorId, superAdmin, companyMemberIds);
if (total != null && total > MAX_EXPORT_ROWS) {
throw new BusinessException("导出数据超过上限 " + MAX_EXPORT_ROWS + " 行,请缩小筛选范围");
}
List<SkipPriceAsinEntity> rows = listFilteredRows(groupId, shopName, asin, country,
minimumPriceFrom, minimumPriceTo, operatorId, superAdmin, null, null);
minimumPriceFrom, minimumPriceTo, operatorId, superAdmin, companyMemberIds, null, null);
Map<Long, String> groupNameById = shopManageGroupService.buildGroupNameMap(rows.stream()
.map(SkipPriceAsinEntity::getGroupId)
.filter(id -> id != null && id > 0)
@@ -159,17 +162,17 @@ public class SkipPriceAsinService {
private Long countFilteredRows(Long groupId, String shopName, String asin, String country,
BigDecimal minimumPriceFrom, BigDecimal minimumPriceTo,
Long operatorId, boolean superAdmin) {
Long operatorId, boolean superAdmin, List<Long> companyMemberIds) {
return skipPriceAsinMapper.selectCount(buildFilterQuery(groupId, shopName, asin, country,
minimumPriceFrom, minimumPriceTo, operatorId, superAdmin));
minimumPriceFrom, minimumPriceTo, operatorId, superAdmin, companyMemberIds));
}
private List<SkipPriceAsinEntity> listFilteredRows(Long groupId, String shopName, String asin, String country,
BigDecimal minimumPriceFrom, BigDecimal minimumPriceTo,
Long operatorId, boolean superAdmin,
Long operatorId, boolean superAdmin, List<Long> companyMemberIds,
Long offset, Long limit) {
LambdaQueryWrapper<SkipPriceAsinEntity> query = buildFilterQuery(groupId, shopName, asin, country,
minimumPriceFrom, minimumPriceTo, operatorId, superAdmin);
minimumPriceFrom, minimumPriceTo, operatorId, superAdmin, companyMemberIds);
if (offset != null && limit != null) {
query.last("LIMIT " + Math.max(0L, offset) + ", " + Math.max(1L, limit));
}
@@ -178,11 +181,12 @@ public class SkipPriceAsinService {
private LambdaQueryWrapper<SkipPriceAsinEntity> buildFilterQuery(Long groupId, String shopName, String asin, String country,
BigDecimal minimumPriceFrom, BigDecimal minimumPriceTo,
Long operatorId, boolean superAdmin) {
Long operatorId, boolean superAdmin,
List<Long> companyMemberIds) {
String safeShopName = normalizeBlank(shopName);
String safeAsin = normalizeBlank(asin);
String safeCountry = normalizeBlank(country).toUpperCase(Locale.ROOT);
Set<Long> accessibleGroupIds = superAdmin ? Set.of() : shopManageGroupService.listAccessibleGroupIds(operatorId, false);
Set<Long> visibleGroupIds = visibleGroupIds(operatorId, superAdmin, companyMemberIds);
LambdaQueryWrapper<SkipPriceAsinEntity> query = new LambdaQueryWrapper<SkipPriceAsinEntity>()
.eq(groupId != null && groupId > 0, SkipPriceAsinEntity::getGroupId, groupId)
.like(!safeShopName.isEmpty(), SkipPriceAsinEntity::getShopName, safeShopName)
@@ -235,16 +239,38 @@ public class SkipPriceAsinService {
}
}
}
if (!superAdmin) {
if (accessibleGroupIds.isEmpty()) {
// null = 不筛(超管没选公司,与今天逐字一致);空集 = 这一档公司一行都不该出现,用恒不成立的 id 兜住。
if (visibleGroupIds != null) {
if (visibleGroupIds.isEmpty()) {
query.eq(SkipPriceAsinEntity::getId, -1L);
} else {
query.in(SkipPriceAsinEntity::getGroupId, accessibleGroupIds);
query.in(SkipPriceAsinEntity::getGroupId, visibleGroupIds);
}
}
return query;
}
/**
* 这一页能看哪些分组:非超管沿用既有可见集,公司 tab 只**收窄**它、不放大。
* 分组归公司必须 created_by_id 与 user_id 两列一起认,口径在
* {@link ShopManageGroupService#listCompanyGroupIds(java.util.List)} 那一处。
*
* @return null = 不筛分组
*/
private Set<Long> visibleGroupIds(Long operatorId, boolean superAdmin, List<Long> companyMemberIds) {
if (companyMemberIds == null) {
return superAdmin ? null : shopManageGroupService.listAccessibleGroupIds(operatorId, false);
}
Set<Long> companyGroupIds = shopManageGroupService.listCompanyGroupIds(companyMemberIds);
if (superAdmin) {
return companyGroupIds;
}
Set<Long> narrowed = new java.util.LinkedHashSet<>(
shopManageGroupService.listAccessibleGroupIds(operatorId, false));
narrowed.retainAll(companyGroupIds);
return narrowed;
}
private void writeExportHeader(Sheet sheet) {
Row header = sheet.createRow(0);
String[] headers = {