refactor(租户): 站点超管判定收成唯一静态出口,看板补第四道门

"super_admin 才算平台超管"这句判断此前在 src/main 里被手抄过 19 遍,2026-10-07 定的
「company_super_admin 在业务数据面同权、只在管理动作收窄」要落地就得一次改到每一处,
漏一处的表现是某一页静默 403 或静默多放行,两边都不报错。现在口径只在
DeviceSessionPolicy.isSuper 比一次:

- 出口做成静态谓词而不是 AdminAuthSupport 实例方法——那 18 支测试里 mock 的是
  AdminAuthSupport,新增实例方法不会被桩到,默认 false 会把范围静默改窄;
- 12 个文件的 15 处调用点改为 DeviceSessionPolicy.isSuper(currentRole(...)),
  DataReadScope/AdminAuthSupport 只留一个委托包装;
- 「客户端任务管理」五个 handler 的成员集计算折进 DataReadScope.superAdminScopedUserIds,
  并在 CompanyIdParamGoesThroughReadScopeTest 里补成第四道门(正反探针各一,
  判据不会因"抽进私有方法"而失明);
- 护栏 SuperAdminPredicateSingleOutletTest 双向钉:出口定义==1、包装==1、调用点==16,
  且 banned 掉实例方法形状(自检断言保证它真能红)。

今天口径仍只认 super_admin,这一层是接缝不是开关。Java 全量在本批收口后的那棵树实测 4032 例
0 红 7 skip(7 支是要本地凭据/夹具的回放与实况探测类,历来 skip)。

一并落在这支的文件(同一文件只能进一次提交,故与同批的归属收口混装):ImageVideo/InvalidAsin/
AdminDeviceLog/AdminTaskCenter/DedupeTotalData/AdminShopDataCrawlTasks/AdminShopDataDuplicateCheck/
QueryAsin/ShopManage/SkipPriceAsin 这 10 支控制器的请求身份改走会话出口见 cp-item7 的说明;
PermissionMenuService 还删掉了 create/update/delete 三个"operator 传 null 即跳过归属闸门"的
无操作者写重载(src/main 无人调用),判据在 MenuWriteOutletOperatorTest。
This commit is contained in:
2026-10-07 20:01:30 +08:00
parent 7c7a7f2665
commit de2bf05ab7
21 changed files with 487 additions and 137 deletions
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.nanri.aiimage.common.exception.BusinessException;
import com.nanri.aiimage.common.model.entity.AdminUserEntity;
import com.nanri.aiimage.common.security.AdminAuthSupport;
import com.nanri.aiimage.common.security.DeviceSessionPolicy;
import com.nanri.aiimage.modules.company.mapper.CompanyMapper;
import com.nanri.aiimage.modules.company.model.dto.CompanySaveRequest;
import com.nanri.aiimage.modules.company.model.entity.CompanyEntity;
@@ -201,7 +202,7 @@ public class CompanyService {
}
private void ensureSuperAdmin(AdminUserEntity operator) {
if (!"super_admin".equals(adminAuthSupport.currentRole(operator))) {
if (!DeviceSessionPolicy.isSuper(adminAuthSupport.currentRole(operator))) {
throw new BusinessException(403, "只有超级管理员可以查看或修改公司配置");
}
}
@@ -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.security.DeviceSessionPolicy;
import com.nanri.aiimage.common.service.DataReadScope;
import com.nanri.aiimage.common.util.DownloadHeaderUtil;
import com.nanri.aiimage.modules.dedupe.model.dto.DedupeTotalDataCreateRequest;
@@ -237,7 +238,7 @@ public class DedupeTotalDataController {
if (operator == null || operator.getId() == null || operator.getId() <= 0) {
throw new BusinessException(403, "无权访问数据去重总数据");
}
boolean superAdmin = "super_admin".equals(adminAuthSupport.currentRole(operator));
boolean superAdmin = DeviceSessionPolicy.isSuper(adminAuthSupport.currentRole(operator));
if (!superAdmin && !hasDedupeTotalDataPermission(operator)) {
throw new BusinessException(403, "无权访问数据去重总数据");
}
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.nanri.aiimage.common.exception.BusinessException;
import com.nanri.aiimage.common.service.NodeSharedStore;
import com.nanri.aiimage.common.security.DeviceSessionPolicy;
import com.nanri.aiimage.common.util.ExcelStreamReader;
import com.nanri.aiimage.modules.dedupe.mapper.DedupeTotalDataMapper;
import com.nanri.aiimage.modules.dedupe.model.dto.DedupeTotalDataCreateRequest;
@@ -1342,9 +1343,8 @@ public class DedupeTotalDataService {
}
private boolean isSuperAdmin(AdminUserEntity user) {
String role = user.getRole() == null ? "" : user.getRole().trim().toLowerCase(Locale.ROOT);
return "super_admin".equals(role)
|| (role.isEmpty() && Integer.valueOf(1).equals(user.getIsAdmin()) && user.getCreatedById() == null);
return user != null
&& DeviceSessionPolicy.isSuperAdmin(user.getRole(), user.getIsAdmin(), user.getCreatedById());
}
private void ensureRecordAccess(DedupeTotalDataEntity entity, AccessScope scope) {
@@ -4,6 +4,7 @@ import com.nanri.aiimage.common.api.ApiResponse;
import com.nanri.aiimage.common.exception.BusinessException;
import com.nanri.aiimage.common.model.entity.AdminUserEntity;
import com.nanri.aiimage.common.security.AdminAuthSupport;
import com.nanri.aiimage.common.security.DeviceSessionPolicy;
import com.nanri.aiimage.common.service.DataReadScope;
import com.nanri.aiimage.modules.devicelog.model.entity.DeviceLogConfigEntity;
import com.nanri.aiimage.modules.devicelog.model.entity.DeviceLogFileEntity;
@@ -164,7 +165,7 @@ public class AdminDeviceLogController {
*/
private AdminUserEntity requireSuperAdmin(HttpServletRequest request) {
AdminUserEntity user = adminAuthSupport.requireAdmin(request);
if (!"super_admin".equals(adminAuthSupport.currentRole(user))) {
if (!DeviceSessionPolicy.isSuper(adminAuthSupport.currentRole(user))) {
log.warn("[device-log] 非超管访问日志管理被拒 userId={} username={}",
user.getId(), user.getUsername());
throw new BusinessException(403, "仅超级管理员可访问日志管理");
@@ -4,6 +4,7 @@ import com.nanri.aiimage.common.api.ApiResponse;
import com.nanri.aiimage.common.exception.BusinessException;
import com.nanri.aiimage.common.model.entity.AdminUserEntity;
import com.nanri.aiimage.common.security.AdminAuthSupport;
import com.nanri.aiimage.common.security.DeviceSessionPolicy;
import com.nanri.aiimage.modules.imagevideo.model.dto.DouyinCopyRequest;
import com.nanri.aiimage.modules.imagevideo.model.dto.ImageVideoSecretSaveRequest;
import com.nanri.aiimage.modules.imagevideo.model.dto.ImageVideoVoiceCloneRequest;
@@ -47,7 +48,9 @@ public class ImageVideoController {
@GetMapping("/secrets")
@Operation(summary = "查询视频密钥配置状态")
public ApiResponse<ImageVideoSecretStatusVo> secretStatus(@RequestParam("user_id") Long userId,
HttpServletRequest request) {
HttpServletRequest request,
HttpServletRequest httpRequest) {
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
return ApiResponse.success(imageVideoSecretService.status(resolveSelfUserId(request, userId)));
}
@@ -55,6 +58,7 @@ public class ImageVideoController {
@Operation(summary = "保存视频密钥配置")
public ApiResponse<ImageVideoSecretStatusVo> saveSecrets(@Valid @RequestBody ImageVideoSecretSaveRequest request,
HttpServletRequest httpRequest) {
request.setUserId(adminAuthSupport.resolveOwnershipUserId(httpRequest, request.getUserId()));
resolveSelfUserId(httpRequest, request.getUserId());
return ApiResponse.success(imageVideoSecretService.save(request));
}
@@ -69,7 +73,7 @@ public class ImageVideoController {
if (requestedUserId == null || requestedUserId <= 0) {
throw new BusinessException("用户 id 不合法");
}
boolean superAdmin = "super_admin".equals(adminAuthSupport.currentRole(me));
boolean superAdmin = DeviceSessionPolicy.isSuper(adminAuthSupport.currentRole(me));
if (!superAdmin && !requestedUserId.equals(me.getId())) {
throw new BusinessException(403, "只能操作自己的视频密钥配置");
}
@@ -78,19 +82,25 @@ public class ImageVideoController {
@PostMapping("/douyin-copy")
@Operation(summary = "抖音文案识别和仿写")
public ApiResponse<ImageVideoAsyncTaskVo> douyinCopy(@Valid @RequestBody DouyinCopyRequest request) {
public ApiResponse<ImageVideoAsyncTaskVo> douyinCopy(@Valid @RequestBody DouyinCopyRequest request,
HttpServletRequest httpRequest) {
request.setUserId(adminAuthSupport.resolveOwnershipUserId(httpRequest, request.getUserId()));
return ApiResponse.success(imageVideoAsyncTaskService.submitDouyinCopy(request));
}
@PostMapping("/workflow/run")
@Operation(summary = "提交图生/复刻视频工作流")
public ApiResponse<ImageVideoAsyncTaskVo> runWorkflow(@Valid @RequestBody ImageVideoWorkflowRunRequest request) {
public ApiResponse<ImageVideoAsyncTaskVo> runWorkflow(@Valid @RequestBody ImageVideoWorkflowRunRequest request,
HttpServletRequest httpRequest) {
request.setUserId(adminAuthSupport.resolveOwnershipUserId(httpRequest, request.getUserId()));
return ApiResponse.success(imageVideoAsyncTaskService.submitWorkflow(request));
}
@PostMapping("/workflow/result")
@Operation(summary = "查询图生/复刻视频工作流异步结果")
public ApiResponse<ImageVideoAsyncTaskVo> workflowResult(@Valid @RequestBody ImageVideoWorkflowResultRequest request) {
public ApiResponse<ImageVideoAsyncTaskVo> workflowResult(@Valid @RequestBody ImageVideoWorkflowResultRequest request,
HttpServletRequest httpRequest) {
request.setUserId(adminAuthSupport.resolveOwnershipUserId(httpRequest, request.getUserId()));
return ApiResponse.success(imageVideoAsyncTaskService.submitWorkflowResult(request));
}
@@ -102,25 +112,33 @@ public class ImageVideoController {
@PostMapping("/voice/list")
@Operation(summary = "查看音色")
public ApiResponse<ImageVideoAsyncTaskVo> listVoices(@Valid @RequestBody ImageVideoVoiceListRequest request) {
public ApiResponse<ImageVideoAsyncTaskVo> listVoices(@Valid @RequestBody ImageVideoVoiceListRequest request,
HttpServletRequest httpRequest) {
request.setUserId(adminAuthSupport.resolveOwnershipUserId(httpRequest, request.getUserId()));
return ApiResponse.success(imageVideoAsyncTaskService.submitVoiceList(request));
}
@PostMapping("/voice/delete")
@Operation(summary = "删除音色")
public ApiResponse<ImageVideoAsyncTaskVo> deleteVoice(@Valid @RequestBody ImageVideoVoiceDeleteRequest request) {
public ApiResponse<ImageVideoAsyncTaskVo> deleteVoice(@Valid @RequestBody ImageVideoVoiceDeleteRequest request,
HttpServletRequest httpRequest) {
request.setUserId(adminAuthSupport.resolveOwnershipUserId(httpRequest, request.getUserId()));
return ApiResponse.success(imageVideoAsyncTaskService.submitVoiceDelete(request));
}
@PostMapping("/voice/clone")
@Operation(summary = "音色克隆")
public ApiResponse<ImageVideoAsyncTaskVo> cloneVoice(@Valid @RequestBody ImageVideoVoiceCloneRequest request) {
public ApiResponse<ImageVideoAsyncTaskVo> cloneVoice(@Valid @RequestBody ImageVideoVoiceCloneRequest request,
HttpServletRequest httpRequest) {
request.setUserId(adminAuthSupport.resolveOwnershipUserId(httpRequest, request.getUserId()));
return ApiResponse.success(imageVideoAsyncTaskService.submitVoiceClone(request));
}
@PostMapping("/voice/synthesis")
@Operation(summary = "语音合成")
public ApiResponse<ImageVideoAsyncTaskVo> synthesizeVoice(@Valid @RequestBody ImageVideoVoiceSynthesisRequest request) {
public ApiResponse<ImageVideoAsyncTaskVo> synthesizeVoice(@Valid @RequestBody ImageVideoVoiceSynthesisRequest request,
HttpServletRequest httpRequest) {
request.setUserId(adminAuthSupport.resolveOwnershipUserId(httpRequest, request.getUserId()));
return ApiResponse.success(imageVideoAsyncTaskService.submitVoiceSynthesis(request));
}
@@ -128,7 +146,9 @@ public class ImageVideoController {
@Operation(summary = "查询图生视频异步任务")
public ApiResponse<ImageVideoAsyncTaskVo> getTask(
@PathVariable Long taskId,
@RequestParam("user_id") Long userId) {
@RequestParam("user_id") Long userId,
HttpServletRequest httpRequest) {
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
return ApiResponse.success(imageVideoAsyncTaskService.getTask(taskId, userId));
}
}
@@ -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.security.DeviceSessionPolicy;
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;
@@ -123,7 +124,7 @@ public class InvalidAsinDataController {
if (operator == null || operator.getId() == null || operator.getId() <= 0) {
throw new BusinessException(403, "无权访问品牌数据库");
}
boolean superAdmin = "super_admin".equals(adminAuthSupport.currentRole(operator));
boolean superAdmin = DeviceSessionPolicy.isSuper(adminAuthSupport.currentRole(operator));
if (!superAdmin && !hasInvalidAsinDataPermission(operator)) {
throw new BusinessException(403, "无权访问品牌数据库");
}
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.nanri.aiimage.common.exception.BusinessException;
import com.nanri.aiimage.common.mapper.AdminUserMapper;
import com.nanri.aiimage.common.security.DeviceSessionPolicy;
import com.nanri.aiimage.modules.permission.mapper.PermissionMenuMapper;
import com.nanri.aiimage.modules.permission.mapper.UserColumnPermissionMapper;
import com.nanri.aiimage.modules.permission.model.dto.PermissionMenuCreateRequest;
@@ -222,17 +223,6 @@ public class PermissionMenuService {
return typeById;
}
@Transactional
public PermissionMenuItemVo create(PermissionMenuCreateRequest request) {
return create(null, null, request);
}
/** Controller-facing variant; the caller may pass the authenticated admin. */
@Transactional
public PermissionMenuItemVo create(AdminUserEntity operator, PermissionMenuCreateRequest request) {
return create(operator, null, request);
}
/**
* 新增菜单。归属公司由 {@code requestedCompanyId} 决定,缺省取操作者本公司(设计文档 §5):
* 站点超管可以替别家建菜单(今天就是他一人在给 133 只账号配权限),非超管只能在自已公司建,
@@ -274,11 +264,6 @@ public class PermissionMenuService {
return toItemVo(getMenuById(entity.getId()));
}
@Transactional
public PermissionMenuItemVo update(Long id, PermissionMenuUpdateRequest request) {
return update(null, id, request);
}
/** Controller-facing variant; validates a parent change against the full ancestor chain. */
@Transactional
public PermissionMenuItemVo update(AdminUserEntity operator, Long id, PermissionMenuUpdateRequest request) {
@@ -318,11 +303,6 @@ public class PermissionMenuService {
return toItemVo(getMenuById(id));
}
@Transactional
public void delete(Long id) {
delete(null, id);
}
/**
* Deletes a leaf menu only. Refusing a parent deletion prevents orphaned
* hierarchy rows and makes the direct-grant meaning deterministic.
@@ -827,11 +807,6 @@ public class PermissionMenuService {
return wantedIds.stream().anyMatch(effective::contains);
}
@Transactional
public void updateUserColumnPermissions(Long userId, UserColumnPermissionUpdateRequest request) {
updateUserColumnPermissions(null, userId, request);
}
/**
* Replaces direct grants. A non-super admin may only grant effective menus
* that the operator already has, and only to themself or a directly-created
@@ -1335,16 +1310,8 @@ public class PermissionMenuService {
}
private boolean isSuperAdmin(AdminUserEntity user) {
if (user == null) {
return false;
}
String role = normalizeRole(user.getRole());
if ("super_admin".equals(role)) {
return true;
}
return role.isEmpty()
&& Integer.valueOf(1).equals(user.getIsAdmin())
&& user.getCreatedById() == null;
return user != null
&& DeviceSessionPolicy.isSuperAdmin(user.getRole(), user.getIsAdmin(), user.getCreatedById());
}
private boolean isNormalUser(AdminUserEntity user) {
@@ -5,6 +5,7 @@ import com.nanri.aiimage.common.exception.BusinessException;
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.security.DeviceSessionPolicy;
import com.nanri.aiimage.common.model.entity.AdminUserEntity;
import com.nanri.aiimage.common.service.DataReadScope;
import com.nanri.aiimage.modules.permission.service.PermissionMenuService;
@@ -96,7 +97,7 @@ public class AdminShopDataCrawlTasksController {
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));
boolean superAdmin = DeviceSessionPolicy.isSuper(adminAuthSupport.currentRole(operator));
// 成员集就地算,且只在超管这一支算(口径同最低价ASIN/查询ASIN);null = 不筛=今天的超管全量。
List<Long> companyMemberIds = superAdmin
? dataReadScope.readScope(operator, companyId).userIdsOr(null)
@@ -4,6 +4,7 @@ import com.nanri.aiimage.common.api.ApiResponse;
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.security.DeviceSessionPolicy;
import com.nanri.aiimage.common.model.entity.AdminUserEntity;
import com.nanri.aiimage.common.service.DataReadScope;
import com.nanri.aiimage.modules.permission.service.PermissionMenuService;
@@ -298,7 +299,7 @@ public class AdminShopDataDuplicateCheckController {
}
}
permissionMenuService.requireShopDataCrawlTaskAccess(operator);
boolean superAdmin = "super_admin".equals(adminAuthSupport.currentRole(operator));
boolean superAdmin = DeviceSessionPolicy.isSuper(adminAuthSupport.currentRole(operator));
return new RequestOperator(operator, superAdmin);
}
@@ -3,6 +3,7 @@ package com.nanri.aiimage.modules.shopkey.controller;
import com.nanri.aiimage.common.api.ApiResponse;
import com.nanri.aiimage.common.util.DownloadHeaderUtil;
import com.nanri.aiimage.common.security.AdminAuthSupport;
import com.nanri.aiimage.common.security.DeviceSessionPolicy;
import com.nanri.aiimage.common.model.entity.AdminUserEntity;
import com.nanri.aiimage.modules.shopkey.model.dto.QueryAsinCountryUpdateRequest;
import com.nanri.aiimage.modules.shopkey.model.dto.QueryAsinCreateRequest;
@@ -185,6 +186,6 @@ public class QueryAsinController {
}
private boolean isSuper(AdminUserEntity operator) {
return "super_admin".equals(adminAuthSupport.currentRole(operator));
return DeviceSessionPolicy.isSuper(adminAuthSupport.currentRole(operator));
}
}
@@ -2,6 +2,7 @@ package com.nanri.aiimage.modules.shopkey.controller;
import com.nanri.aiimage.common.api.ApiResponse;
import com.nanri.aiimage.common.security.AdminAuthSupport;
import com.nanri.aiimage.common.security.DeviceSessionPolicy;
import com.nanri.aiimage.common.model.entity.AdminUserEntity;
import com.nanri.aiimage.common.service.DataReadScope;
import com.nanri.aiimage.modules.shopkey.model.dto.ShopManageCreateRequest;
@@ -64,7 +65,7 @@ public class ShopManageController {
}
private boolean isSuper(AdminUserEntity operator) {
return "super_admin".equals(adminAuthSupport.currentRole(operator));
return DeviceSessionPolicy.isSuper(adminAuthSupport.currentRole(operator));
}
@GetMapping
@@ -3,6 +3,7 @@ package com.nanri.aiimage.modules.shopkey.controller;
import com.nanri.aiimage.common.api.ApiResponse;
import com.nanri.aiimage.common.util.DownloadHeaderUtil;
import com.nanri.aiimage.common.security.AdminAuthSupport;
import com.nanri.aiimage.common.security.DeviceSessionPolicy;
import com.nanri.aiimage.common.model.entity.AdminUserEntity;
import com.nanri.aiimage.modules.shopkey.model.dto.SkipPriceAsinCountryUpdateRequest;
import com.nanri.aiimage.modules.shopkey.model.dto.SkipPriceAsinCreateRequest;
@@ -202,6 +203,6 @@ public class SkipPriceAsinController {
}
private boolean isSuper(AdminUserEntity operator) {
return "super_admin".equals(adminAuthSupport.currentRole(operator));
return DeviceSessionPolicy.isSuper(adminAuthSupport.currentRole(operator));
}
}
@@ -32,16 +32,13 @@ import java.util.List;
* <p>仅超管默认可见;管理员需超管在「用户管理 → 菜单权限」授权 {@code admin_task_center}
* 后才能访问。数据范围 = 本人 + 本组用户 + 自己管理的成员(超管不裁剪)。</p>
*
* <p>公司 tab(spec §4):五个端点各收一个可选 {@code company_id},都在 handler 体内过唯一出口
* {@link DataReadScope#readScope} 算成员集,再交给 {@code TaskCenterScopeService.resolve} 与既有口径
* 求交——一处收窄,五个出口天然同宽(详情走 {@code scope.visible()},用的就是同一条集合)。
* 那一行之所以在五个 handler 里各写一遍而不是抽进私有方法:护栏
* {@code CompanyIdParamGoesThroughReadScopeTest} 的断言 A 认的是「这支 handler 体内出现过 readScope(」,
* 抽走之后**只有 A 会红**(且因为 A 是 fail-fast,只点名第一支);C 根本不响——它的门槛就是「体内含
* readScope(」,体内没了就连评估都不评估;D 绿——它认 {@code resolveScope(},而 {@code companyId} 正好
* 还在那条私有委托的实参表里。所以逐字重复买到的是「A 这一记看守在每支 handler 上各站一次」,
* 不是三重红:别把它当成「C/D 也兜着」而去试 A 拦得住之外的形状(2026-10-05 复评 I-2 订正,
* 原话「抽走即三只都红」与 MUT-A 的实测读数 2 tests / 1 failure 不符)。</p>
* <p>公司 tab(spec §4):五个端点各收一个可选 {@code company_id},都在 handler 体内过一次唯一出口
* {@link DataReadScope#superAdminScopedUserIds} 算成员集,再交给 {@code TaskCenterScopeService.resolve}
* 与既有口径求交——一处收窄,五个出口天然同宽(详情走 {@code scope.visible()},用的就是同一条集合)。
* 此前这一行在五个 handler 里逐字重复(当时的护栏断言 A 只认「体内出现过 {@code readScope(}」,抽走即红),
* 2026-10-07 三期把 {@code superAdminScopedUserIds} 补进 {@code SCOPE_DOORS} 之后,那道理由不再成立:
* 判据跟着出口走,而不是让出口迁就判据(见 {@code CompanyIdParamGoesThroughReadScopeTest}
* 里 {@code SUPER_SCOPED_*} 三枚探针)。</p>
*/
@RestController
@RequiredArgsConstructor
@@ -65,9 +62,8 @@ public class AdminTaskCenterController {
@Parameter(description = "公司 ID(超管 tab;不传=不筛)")
@RequestParam(name = "company_id", required = false) Long companyId) {
AdminUserEntity operator = authorizedOperator(request);
boolean superAdmin = isSuper(operator);
Long operatorId = operator.getId();
List<Long> companyUserIds = superAdmin ? dataReadScope.readScope(operator, companyId).userIdsOr(null) : null;
List<Long> companyUserIds = dataReadScope.superAdminScopedUserIds(operator, companyId);
TaskCenterScopeService.ScopeContext scope = resolveScope(operatorId, companyUserIds);
return ApiResponse.success(queryService.overview(scope));
}
@@ -80,9 +76,8 @@ public class AdminTaskCenterController {
@Parameter(description = "公司 ID(超管 tab;不传=不筛)")
@RequestParam(name = "company_id", required = false) Long companyId) {
AdminUserEntity operator = authorizedOperator(request);
boolean superAdmin = isSuper(operator);
Long operatorId = operator.getId();
List<Long> companyUserIds = superAdmin ? dataReadScope.readScope(operator, companyId).userIdsOr(null) : null;
List<Long> companyUserIds = dataReadScope.superAdminScopedUserIds(operator, companyId);
TaskCenterScopeService.ScopeContext scope = resolveScope(operatorId, companyUserIds);
return ApiResponse.success(queryService.shopOptions(scope));
}
@@ -98,9 +93,8 @@ public class AdminTaskCenterController {
@Parameter(description = "公司 ID(超管 tab;不传=不筛)")
@RequestParam(name = "company_id", required = false) Long companyId) {
AdminUserEntity operator = authorizedOperator(request);
boolean superAdmin = isSuper(operator);
Long operatorId = operator.getId();
List<Long> companyUserIds = superAdmin ? dataReadScope.readScope(operator, companyId).userIdsOr(null) : null;
List<Long> companyUserIds = dataReadScope.superAdminScopedUserIds(operator, companyId);
TaskCenterScopeService.ScopeContext scope = resolveScope(operatorId, companyUserIds);
return ApiResponse.success(queryService.tasks(scope, query));
}
@@ -114,9 +108,8 @@ public class AdminTaskCenterController {
@Parameter(description = "公司 ID(超管 tab;不传=不筛)")
@RequestParam(name = "company_id", required = false) Long companyId) {
AdminUserEntity operator = authorizedOperator(request);
boolean superAdmin = isSuper(operator);
Long operatorId = operator.getId();
List<Long> companyUserIds = superAdmin ? dataReadScope.readScope(operator, companyId).userIdsOr(null) : null;
List<Long> companyUserIds = dataReadScope.superAdminScopedUserIds(operator, companyId);
TaskCenterScopeService.ScopeContext scope = resolveScope(operatorId, companyUserIds);
TaskCenterTaskDetailVo detail = queryService.detail(scope, taskNo);
if (detail == null) {
@@ -138,9 +131,8 @@ public class AdminTaskCenterController {
@Parameter(description = "公司 ID(超管 tab;不传=不筛)")
@RequestParam(name = "company_id", required = false) Long companyId) {
AdminUserEntity operator = authorizedOperator(request);
boolean superAdmin = isSuper(operator);
Long operatorId = operator.getId();
List<Long> companyUserIds = superAdmin ? dataReadScope.readScope(operator, companyId).userIdsOr(null) : null;
List<Long> companyUserIds = dataReadScope.superAdminScopedUserIds(operator, companyId);
TaskCenterScopeService.ScopeContext scope = resolveScope(operatorId, companyUserIds);
return ApiResponse.success(variantService.variantTasks(scope, status, taskType, page, pageSize));
}
@@ -154,18 +146,9 @@ public class AdminTaskCenterController {
}
/**
* 是否站点超管——用的是 {@code AdminAuthSupport.currentRole}(与 {@code DataReadScope} 内部同一把尺子,
* 含「role 为空 + isAdmin=1 + createdById 为空」的历史超管推断),不是这里新造的判定。
* 只有超管才按公司 tab 收窄:非超管的可见集里含「靠分组可见」的行,给它叠成员集会把那批行
* 从每一个 tab 里静默删掉;它的公司维度本来就由会话独家决定(spec §4)。
*/
private boolean isSuper(AdminUserEntity operator) {
return "super_admin".equals(adminAuthSupport.currentRole(operator));
}
/**
* 五个端点共用的收窄出口:{@code companyUserIds} 必须是 handler 体内 {@code readScope} 算出来的那个值
* ({@code null} = 不收窄),不许在这一层重新取公司值——那样护栏 A/C/D 看见的就不是这条链了。
* 五个端点共用的收窄出口:{@code companyUserIds} 必须是 handler 体内
* {@link DataReadScope#superAdminScopedUserIds} 算出来的那个值({@code null} = 不收窄),
* 不许在这一层重新取公司值——那样护栏 A/C/D 看见的就不是这条链了。
*/
private TaskCenterScopeService.ScopeContext resolveScope(Long operatorId, List<Long> companyUserIds) {
return scopeService.resolve(operatorId, companyUserIds);
@@ -2,6 +2,7 @@ package com.nanri.aiimage.modules.taskcenter.service;
import com.nanri.aiimage.common.exception.BusinessException;
import com.nanri.aiimage.common.mapper.AdminUserMapper;
import com.nanri.aiimage.common.security.DeviceSessionPolicy;
import com.nanri.aiimage.common.mapper.ShopManageGroupMapper;
import com.nanri.aiimage.common.model.entity.AdminUserEntity;
import com.nanri.aiimage.common.service.CompanyScopeSupport;
@@ -104,9 +105,8 @@ public class TaskCenterScopeService {
}
private boolean isSuperAdmin(AdminUserEntity user) {
String role = user.getRole() == null ? "" : user.getRole().trim().toLowerCase(Locale.ROOT);
return "super_admin".equals(role)
|| (role.isEmpty() && Integer.valueOf(1).equals(user.getIsAdmin()) && user.getCreatedById() == null);
return user != null
&& DeviceSessionPolicy.isSuperAdmin(user.getRole(), user.getIsAdmin(), user.getCreatedById());
}
/** 公司超管判定(老数据 role 为空不参与:公司超管是新角色,只认显式取值)。 */
@@ -7,6 +7,7 @@ import com.nanri.aiimage.modules.admin.spi.UserSecretCleanupPort;
import com.nanri.aiimage.common.security.ShopCredentialCryptoService;
import com.nanri.aiimage.config.UserSecretProperties;
import com.nanri.aiimage.common.security.AdminAuthSupport;
import com.nanri.aiimage.common.security.DeviceSessionPolicy;
import com.nanri.aiimage.common.service.ReadScope;
import com.nanri.aiimage.modules.notification.service.NotificationDispatchService;
import com.nanri.aiimage.modules.notification.service.NotificationService;
@@ -205,7 +206,7 @@ public class UserApiSecretService implements UserSecretCleanupPort {
/** 数据权限:超管可操作全部;其余管理员只能操作自己数据权限范围内的用户。 */
private void requireVisibleUser(AdminUserEntity operator, Long userId) {
if (operator != null && "super_admin".equals(adminAuthSupport.currentRole(operator))) {
if (operator != null && DeviceSessionPolicy.isSuper(adminAuthSupport.currentRole(operator))) {
return;
}
Long operatorId = operator == null ? null : operator.getId();
@@ -326,7 +327,7 @@ public class UserApiSecretService implements UserSecretCleanupPort {
long pageSize = safeQuery.getPageSize() == null || safeQuery.getPageSize() < 1
? 15L : Math.min(safeQuery.getPageSize(), 100L);
boolean superAdmin = "super_admin".equals(adminAuthSupport.currentRole(operator));
boolean superAdmin = DeviceSessionPolicy.isSuper(adminAuthSupport.currentRole(operator));
Long requestedGroupId = safeQuery.getGroupId();
// 组隔离(主管锁定自己带的分组、超管按 group_id 筛)叠上公司 tab:两条维度取**交集**,
// 公司 tab 只能收窄,绝不放大分组看不到的行;范围本身由 controller 经唯一出口算好交下来。
@@ -419,7 +420,7 @@ public class UserApiSecretService implements UserSecretCleanupPort {
* ({@link ReadScope#userIdsOr}),留着是为了让 service 不依赖出口的内部 ⇒ <b>勿把它当成第二次判公司</b>。
*/
List<Long> scopedUserIds(AdminUserEntity operator, Long requestedGroupId, ReadScope companyScope) {
boolean superAdmin = "super_admin".equals(adminAuthSupport.currentRole(operator));
boolean superAdmin = DeviceSessionPolicy.isSuper(adminAuthSupport.currentRole(operator));
List<Long> base = null;
if (superAdmin) {
if (requestedGroupId != null && requestedGroupId > 0) {
@@ -2,6 +2,7 @@ package com.nanri.aiimage.modules.usersecret.service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.nanri.aiimage.common.security.AdminAuthSupport;
import com.nanri.aiimage.common.security.DeviceSessionPolicy;
import com.nanri.aiimage.common.service.ReadScope;
import com.nanri.aiimage.common.mapper.AdminUserMapper;
import com.nanri.aiimage.common.model.entity.AdminUserEntity;
@@ -99,7 +100,7 @@ public class UserSecretUsageService {
long pageSize = safeQuery.getPageSize() == null || safeQuery.getPageSize() < 1
? 15L : Math.min(safeQuery.getPageSize(), 100L);
boolean superAdmin = "super_admin".equals(adminAuthSupport.currentRole(operator));
boolean superAdmin = DeviceSessionPolicy.isSuper(adminAuthSupport.currentRole(operator));
Long requestedGroupId = safeQuery.getGroupId();
// 组隔离(主管锁定自己带的分组、超管按 group_id 筛)叠上公司 tab:取**交集**,公司 tab 只收窄。
List<Long> scopedUserIds = scopedUserIds(operator, requestedGroupId, companyScope);
@@ -224,7 +225,7 @@ public class UserSecretUsageService {
* ({@link ReadScope#userIdsOr}),留着是为了让 service 不依赖出口的内部 ⇒ <b>勿把它当成第二次判公司</b>。
*/
List<Long> scopedUserIds(AdminUserEntity operator, Long requestedGroupId, ReadScope companyScope) {
boolean superAdmin = "super_admin".equals(adminAuthSupport.currentRole(operator));
boolean superAdmin = DeviceSessionPolicy.isSuper(adminAuthSupport.currentRole(operator));
List<Long> base = null;
if (superAdmin) {
if (requestedGroupId != null && requestedGroupId > 0) {