fix(权限): 店铺数据重复检查仅勾菜单无「店铺数据记录」仍403——校验口径与自动补权对齐(任务/重复检查任一菜单+数据权限即可放行,镜像魏振峰反馈: 只勾103未勾94且数据权限已补仍被拒); 顺带修复 controller 直连 mapper 架构违规 resolveVisibleShopNameKeys 下沉 ShopDataCrawlAdminTasksService

This commit is contained in:
2026-09-07 15:08:43 +08:00
parent 3f78bbbe91
commit e7cd830ebe
4 changed files with 156 additions and 15 deletions
@@ -377,7 +377,15 @@ public class PermissionMenuService {
return requestedIds.size();
}
/** Verifies both the visible admin menu and its separately managed data grant. */
/**
* Verifies a visible shop-data admin menu and its separately managed data grant.
*
* <p>校验口径与 {@link #autoGrantShopDataDataPermission} 保持一致:「店铺数据记录」
* {@code admin_shop_data_crawl_tasks} 或「店铺数据重复检查」{@code admin_shop_data_duplicate_check}
* 任一可见菜单,并同时持有内部数据权限 {@code admin_shop_data_crawl_task_data}。
* 只勾了「店铺数据重复检查」而未勾「店铺数据记录」的管理员(数据权限已被自动补上)
* 不应再被 403 拒绝。</p>
*/
public void requireShopDataCrawlTaskAccess(AdminUserEntity operator) {
ensureAdminOperatorIfPresent(operator);
if (operator == null || operator.getId() == null || operator.getId() <= 0) {
@@ -388,10 +396,13 @@ public class PermissionMenuService {
}
PermissionMenuEntity taskMenu = requireDataPermission(
"admin_shop_data_crawl_tasks", "店铺数据任务管理菜单");
PermissionMenuEntity duplicateCheckMenu = requireDataPermission(
"admin_shop_data_duplicate_check", "店铺数据重复检查菜单");
PermissionMenuEntity dataPermission = requireDataPermission(
SHOP_DATA_CRAWL_DATA_PERMISSION_KEY, "店铺数据任务数据");
if (!hasEffectiveColumnPermission(operator.getId(), taskMenu.getId())
|| !hasEffectiveColumnPermission(operator.getId(), dataPermission.getId())) {
boolean hasShopDataMenu = hasEffectiveColumnPermission(operator.getId(), taskMenu.getId())
|| hasEffectiveColumnPermission(operator.getId(), duplicateCheckMenu.getId());
if (!hasShopDataMenu || !hasEffectiveColumnPermission(operator.getId(), dataPermission.getId())) {
throw new BusinessException(403, "无权查看店铺数据任务");
}
}