From 4596e7d840ade5787be304ea9c39d73cbe0c8c82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E8=87=AA=E8=BE=BE?= <980324341@qq.com> Date: Tue, 6 Oct 2026 11:44:20 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E5=95=86=E5=93=81=E7=B1=BB=E7=9B=AE):=20?= =?UTF-8?q?=E9=9D=9E=E8=B6=85=E7=AE=A1=E8=AF=BB=E4=BE=A7=E9=92=89=E6=9C=AC?= =?UTF-8?q?=E5=85=AC=E5=8F=B8=20+=20=E5=86=99=E4=BE=A7=E8=A1=A5=E8=A1=8C?= =?UTF-8?q?=E5=BD=92=E5=B1=9E=E9=97=B8=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 10-06 逐节点复验实测:公司 2 的 admin 读 /api/admin/product-categories 仍得 412 行, 其中 394 行是公司 1 的自建类目。根因是这一页走的是第二道门 readCompanyId —— 它「非超管返回 null(不筛)」是为品牌库「靠分组可见的行」刻意设计的, 而 biz_product_category 连账号列都没有,null 在这里就是把整棵树交给每一家。 - DataReadScope 新增第三道门 readCompanyIdOrOwn:超管按 tab,非超管(含 company_super_admin)一律 requireCompanyId(operator),带别家 tab 也不越权、也不返回空 (类目树没有「空树」这个可用视图,返回空会连自建根都挂不上)。 - 写侧同批补闸门:读收窄而写不收窄=藏起来的行照样能改名/删除,那是静默删除不是隔离。 update/delete 收 writeCompanyId(operator),与行自己的 company_id 比(不与 tab 比: 内置行归哨兵 0,任何公司账号都不该改得动它);判定复用 CompanyScopeSupport .assertSameCompany,不再各处比一次。 - 品牌库那扇门与其三条「非超管=null」用例原样保留 —— 那是另一张表的正确口径。 - 护栏:G2 把第三道门接进 SCOPE_DOORS/SCOPE_CALLEE_NAMES,并自带能红/能绿两向探针 (只认 readScope 的自检等于第二、三道门没人看守);新增 14 例,后端全量 3841 例 0 红。 --- .../aiimage/common/service/DataReadScope.java | 32 +++++ .../controller/ProductCategoryController.java | 18 +-- .../service/ProductCategoryService.java | 29 ++++- ...ompanyIdParamGoesThroughReadScopeTest.java | 86 ++++++++++++-- .../common/service/DataReadScopeTest.java | 61 ++++++++++ ...uctCategoryControllerCompanyScopeTest.java | 47 ++++++-- .../ProductCategoryCompanyScopeTest.java | 109 +++++++++++++++++- 7 files changed, 355 insertions(+), 27 deletions(-) diff --git a/backend-java/src/main/java/com/nanri/aiimage/common/service/DataReadScope.java b/backend-java/src/main/java/com/nanri/aiimage/common/service/DataReadScope.java index 5738605a2..23e13c791 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/common/service/DataReadScope.java +++ b/backend-java/src/main/java/com/nanri/aiimage/common/service/DataReadScope.java @@ -61,4 +61,36 @@ public class DataReadScope { } return requestedCompanyId != null && requestedCompanyId > 0 ? requestedCompanyId : null; } + + /** + * 第三道门:归属物化成 {@code company_id} 列、且可见集不靠账号/分组的表(商品类目)。 + * + *
与 {@link #readCompanyId} 只差非超管那一支。差别不是省事,是那张表没有可以保护的东西: + * 品牌库的"非超管不筛"靠的是账号/分组谓词兜住可见集,而 {@code biz_product_category} + * 连账号列都没有(V147 才加的 {@code company_id})。返回 null 在这里等于把整棵树交给每一家—— + * 2026-10-06 逐节点复验实测:公司 2 的 admin 读该页得 412 行,其中 394 行是公司 1 的自建类目。
+ * + *非超管钉在本公司而不是"带别家就返回空":类目树里没有"空树"这个可用视图—— + * 内置节点(哨兵 0)在任何公司视图里都必须在,否则那一家装不上任何自建子级。 + * 请求里带什么都不算,与 {@code readScope} 非超管分支同一口径(tab 不是安全边界)。
+ */ + public Long readCompanyIdOrOwn(AdminUserEntity operator, Long requestedCompanyId) { + if (SUPER_ADMIN.equals(adminAuthSupport.currentRole(operator))) { + return requestedCompanyId != null && requestedCompanyId > 0 ? requestedCompanyId : null; + } + return companyScope.requireCompanyId(operator); + } + + /** + * 写侧的行级归属闸门要的值:{@code null} = 平台超管不限,其余账号一律是自己那一家。 + * + *读侧收窄而写侧不收窄,等于"藏起来的行仍然能删"——那是静默删除,不是隔离。 + * 返回值直接交给 service 与行自己的 {@code company_id} 比(不是与 tab 比: + * 内置行归哨兵 0,任何公司账号都不该改得动它)。
+ */ + public Long writeCompanyId(AdminUserEntity operator) { + return SUPER_ADMIN.equals(adminAuthSupport.currentRole(operator)) + ? null + : companyScope.requireCompanyId(operator); + } } diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/productcategory/controller/ProductCategoryController.java b/backend-java/src/main/java/com/nanri/aiimage/modules/productcategory/controller/ProductCategoryController.java index a3ab671a7..ae068b4c0 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/productcategory/controller/ProductCategoryController.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/productcategory/controller/ProductCategoryController.java @@ -50,7 +50,7 @@ public class ProductCategoryController { @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); + Long scopedCompanyId = dataReadScope.readCompanyIdOrOwn(operator, companyId); return ApiResponse.success(productCategoryService.list(keyword, scopedCompanyId)); } @@ -63,7 +63,7 @@ public class ProductCategoryController { @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); + Long scopedCompanyId = dataReadScope.readCompanyIdOrOwn(operator, companyId); return ApiResponse.success(productCategoryService.children(parentId, page, pageSize, scopedCompanyId)); } @@ -76,7 +76,7 @@ public class ProductCategoryController { @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); + Long scopedCompanyId = dataReadScope.readCompanyIdOrOwn(operator, companyId); return ApiResponse.success(productCategoryService.search(keyword, page, pageSize, scopedCompanyId)); } @@ -87,7 +87,7 @@ public class ProductCategoryController { @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); + Long scopedCompanyId = dataReadScope.readCompanyIdOrOwn(operator, companyId); byte[] bytes = productCategoryService.export(keyword, scopedCompanyId); String filename = "product-categories-" + LocalDateTime.now().format(EXPORT_FILENAME_FORMATTER) + ".xlsx"; return ResponseEntity.ok() @@ -114,8 +114,10 @@ public class ProductCategoryController { HttpServletRequest request, @PathVariable Long id, @Valid @RequestBody ProductCategorySaveRequest body) { - adminAuthSupport.requireAdminOrInternal(request); - return ApiResponse.success("保存成功", productCategoryService.update(id, body)); + // 写侧闸门与读侧同源:读已经收窄到本公司,写不收窄就是"藏起来的行照样能删"。 + AdminUserEntity operator = adminAuthSupport.requireAdminOrInternal(request); + return ApiResponse.success("保存成功", + productCategoryService.update(id, body, dataReadScope.writeCompanyId(operator))); } @DeleteMapping("/product-category/{id}") @@ -123,8 +125,8 @@ public class ProductCategoryController { public ApiResponse内置节点(哨兵 0)在这一支里必然被拒——{@code 0 != 任何真实公司 id}, + * 而"公司账号能改/删平台内置类目"正是这一页最容易出事的一刀:改了它, + * 所有公司的类目树与货源归类的候选表同一天跟着变。
+ */ + private void assertRowWritable(ProductCategoryEntity row, Long writableCompanyId) { + if (writableCompanyId == null) { + return; + } + companyScopeSupport.assertSameCompany(writableCompanyId, row.getCompanyId(), + "无权修改该类目:内置类目或别家公司的类目不在本公司的写范围内"); + } + private ProductCategoryItemVo findItem(Long id) { ProductCategoryEntity entity = getById(id); Long childCount = productCategoryMapper.selectCount(new LambdaQueryWrapper两条正门是并列的白名单而不是新的自由口径:判据 A/C/D 与 {@code readScope} 逐字共用, - * 只是把"出现过 readScope("换成"出现过两条正门之一"," companyId 进了 readScope 的实参表"换成 - * "进了两条正门之一的实参表"。第三条正门(比如页里自己写 {@code if (companyId != null) ...}) - * 依然红。
+ *几条正门是并列的白名单而不是新的自由口径:判据 A/C/D 与 {@code readScope} 逐字共用, + * 只是把"出现过 readScope("换成"出现过任一正门"," companyId 进了 readScope 的实参表"换成 + * "进了任一正门的实参表"。页里自己写 {@code if (companyId != null) ...} 那一族 + * 依然红——名单只加在 {@code DataReadScope} 上,加不在页上。
*/ private static final String READ_COMPANY_ID_CALL = "readCompanyId("; - private static final List它补的是 {@code readCompanyId} 在非超管那一支的洞:品牌库的"非超管不筛"靠账号/分组谓词兜底, + * 商品类目既没有账号列也没有分组可见集,返回 null 就是"每一家都读到整棵树"—— + * 2026-10-06 逐节点复验实测公司 2 的 admin 在该页读到 412 行(含公司 1 的 394 个自建类目)。
+ * + *入名单的前提是它仍然只是 {@code DataReadScope} 上的一个方法,不是页里自己写的 if: + * 第三条门若开在 controller 里,这一页的判据就没人看守了。
+ */ + private static final String READ_OWN_COMPANY_ID_CALL = "readCompanyIdOrOwn("; + private static final List10-05 批次 2/3 实跑 6 记假红全在这一形上——断言 A 要求正门调用写在 handler 块内,
@@ -632,6 +678,29 @@ class CompanyIdParamGoesThroughReadScopeTest {
.isNotNull()
.contains("没进任何 " + SCOPE_CALLEE_LABEL + " 的实参列表");
+ // 第三道门同样要各自带能红/能绿两向证据:C 与 D 都是对 SCOPE_DOORS 逐条跑的,
+ // 少一枚探针就等于那道门上的返回值与入参没人看守(类目页正是走这道门的页)。
+ assertThat(scopeProbeReason(READ_OWN_COMPANY_ID_CAUGHT_PROBE, "READ_OWN_COMPANY_ID_CAUGHT_PROBE"))
+ .as("断言 C 自检(第三道门·正样本):Long scopedCompanyId = readCompanyIdOrOwn(user, companyId) "
+ + "且它进了 service.list(…) 的实参 ⇒ 判红就是护栏假红")
+ .isNull();
+ assertThat(companyIdArgProbeReason(
+ READ_OWN_COMPANY_ID_CAUGHT_PROBE, "READ_OWN_COMPANY_ID_CAUGHT_PROBE", CAMEL_PARAM))
+ .as("断言 D 自检(第三道门·正样本):companyId 真进了 readCompanyIdOrOwn 的实参表 ⇒ 不许红")
+ .isNull();
+ assertThat(scopeProbeReason(READ_OWN_COMPANY_ID_DISCARD_PROBE, "READ_OWN_COMPANY_ID_DISCARD_PROBE"))
+ .as("断言 C 自检(第三道门·负样本):readCompanyIdOrOwn( 写成裸语句、结果当场丢掉 ⇒ 必须判红")
+ .isNotNull()
+ .contains("范围算了但没接住");
+ assertThat(scopeProbeReason(READ_OWN_COMPANY_ID_PASSED_NULL_PROBE, "READ_OWN_COMPANY_ID_PASSED_NULL_PROBE"))
+ .as("断言 D(第三道门)负样本的前提(断言 C):结果接进 scopedCompanyId 又喂给了 service ⇒ C 判它绿")
+ .isNull();
+ assertThat(companyIdArgProbeReason(
+ READ_OWN_COMPANY_ID_PASSED_NULL_PROBE, "READ_OWN_COMPANY_ID_PASSED_NULL_PROBE", CAMEL_PARAM))
+ .as("断言 D 自检(第三道门·负样本):readCompanyIdOrOwn(user, null) ⇒ 必须判红")
+ .isNotNull()
+ .contains("没进任何 " + SCOPE_CALLEE_LABEL + " 的实参列表");
+
// 配对括号取实参表(放宽)的成对证据:两枚正样本必须绿(否则 6 支已接线 handler 假红),
// 一枚"嵌套了但没带公司参数"的样本必须照旧红(否则放宽 = 把 D 关掉)。
assertThat(scopeProbeReason(SCOPE_NESTED_ARG_PROBE, "SCOPE_NESTED_ARG_PROBE"))
@@ -753,7 +822,8 @@ class CompanyIdParamGoesThroughReadScopeTest {
+ " 页(改名/换 mapping/换参数形状会让它静默脱离射程,分母不能自造)")
.contains(WIRED_PAGE_KEYS.toArray(new String[0]));
assertThat(scopeDiscarded)
- .as("范围算了但没接住(断言 C):两条正门(readScope( / readCompanyId()的结果要么没赋给变量,"
+ .as("范围算了但没接住(断言 C):" + String.join(" / ", SCOPE_DOORS)
+ + ")的结果要么没赋给变量,"
+ "要么赋了却没交给任何方法调用")
.isEmpty();
diff --git a/backend-java/src/test/java/com/nanri/aiimage/common/service/DataReadScopeTest.java b/backend-java/src/test/java/com/nanri/aiimage/common/service/DataReadScopeTest.java
index a77658f2b..0fb9a02b7 100644
--- a/backend-java/src/test/java/com/nanri/aiimage/common/service/DataReadScopeTest.java
+++ b/backend-java/src/test/java/com/nanri/aiimage/common/service/DataReadScopeTest.java
@@ -1,8 +1,10 @@
package com.nanri.aiimage.common.service;
import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verifyNoInteractions;
import static org.mockito.Mockito.when;
import com.nanri.aiimage.common.model.entity.AdminUserEntity;
import com.nanri.aiimage.common.security.AdminAuthSupport;
@@ -145,4 +147,63 @@ class DataReadScopeTest {
assertThat(dataReadScope.readCompanyId(user(5L, "admin", 2L), 7L)).isNull();
assertThat(dataReadScope.readCompanyId(user(5L, "admin", 2L), null)).isNull();
}
+
+ // ---- 第三道门 readCompanyIdOrOwn:归属物化列、且可见集不靠账号/分组的表(商品类目)----
+ // 与第二道门只差非超管那一支,而那一支正是 10-06 逐节点复验抓到的洞:biz_product_category 连账号列
+ // 都没有,非超管返回 null=把整棵树交给每一家(实测公司 2 的 admin 读到 412 行、其中 394 行是公司 1
+ // 的自建类目)。这三条若不写,把 `requireCompanyId` 改回 `return null` 不会让任何现有用例变红。
+
+ @Test
+ @DisplayName("第三道门:超管仍按 tab 走(tab 是视图开关,不是安全边界)")
+ void readOwnDoorForSuperAdminFollowsTheTab() {
+ assertThat(dataReadScope.readCompanyIdOrOwn(user(1L, "super_admin", 1L), 2L)).isEqualTo(2L);
+ assertThat(dataReadScope.readCompanyIdOrOwn(user(1L, "super_admin", 1L), null)).isNull();
+ assertThat(dataReadScope.readCompanyIdOrOwn(user(1L, "super_admin", 1L), 0L)).isNull();
+ assertThat(dataReadScope.readCompanyIdOrOwn(user(1L, "super_admin", 1L), -3L)).isNull();
+ }
+
+ @Test
+ @DisplayName("第三道门:非超管钉本公司,带别家的 tab 也不越权、也不返回空")
+ void readOwnDoorPinsNonSuperAdminToItsOwnCompany() {
+ when(companyScope.requireCompanyId(any(AdminUserEntity.class))).thenReturn(2L);
+ assertThat(dataReadScope.readCompanyIdOrOwn(user(5L, "admin", 2L), 2L)).isEqualTo(2L);
+ // 传 7(别家)必须还是 2:类目树没有"空树"这个可用视图,返回空集等于把那一家自己的自建项也删掉。
+ assertThat(dataReadScope.readCompanyIdOrOwn(user(5L, "admin", 2L), 7L)).isEqualTo(2L);
+ assertThat(dataReadScope.readCompanyIdOrOwn(user(5L, "admin", 2L), null)).isEqualTo(2L);
+ }
+
+ /** 「公司超级管理员」在这三道门里都按非超管处理——它不是 super_admin,这一支若漂了就是整家公司越权。 */
+ @Test
+ @DisplayName("第三道门:company_super_admin 按非超管钉本公司,不当站点超管")
+ void readOwnDoorTreatsCompanySuperAdminAsNonSuperAdmin() {
+ when(companyScope.requireCompanyId(any(AdminUserEntity.class))).thenReturn(2L);
+ assertThat(dataReadScope.readCompanyIdOrOwn(user(9L, "company_super_admin", 2L), null)).isEqualTo(2L);
+ assertThat(dataReadScope.readCompanyIdOrOwn(user(9L, "company_super_admin", 2L), 7L)).isEqualTo(2L);
+ }
+
+ // ---- 写侧闸门 writeCompanyId:读收窄而写不收窄="藏起来的行照样能删" ----
+
+ @Test
+ @DisplayName("写闸门:平台超管给 null(不限),不许把超管锁死在他自己那一行 companyId 上")
+ void writeGateLeavesTheSiteSuperAdminUnrestricted() {
+ assertThat(dataReadScope.writeCompanyId(user(1L, "super_admin", 1L))).isNull();
+ verifyNoInteractions(companyScope);
+ }
+
+ @Test
+ @DisplayName("写闸门:非超管给本公司,且完全不看请求里带了什么(无 tab 形参可言)")
+ void writeGateReturnsTheOperatorsOwnCompany() {
+ when(companyScope.requireCompanyId(any(AdminUserEntity.class))).thenReturn(2L);
+ assertThat(dataReadScope.writeCompanyId(user(5L, "admin", 2L))).isEqualTo(2L);
+ assertThat(dataReadScope.writeCompanyId(user(9L, "company_super_admin", 2L))).isEqualTo(2L);
+ }
+
+ @Test
+ @DisplayName("写闸门:没有公司归属的账号当场炸,不退化成 null=不限")
+ void writeGateFailsFastWithoutCompanyMembership() {
+ when(companyScope.requireCompanyId(any(AdminUserEntity.class)))
+ .thenThrow(new com.nanri.aiimage.common.exception.BusinessException(403, "当前账号没有所属公司"));
+ assertThatThrownBy(() -> dataReadScope.writeCompanyId(user(5L, "admin", null)))
+ .isInstanceOf(com.nanri.aiimage.common.exception.BusinessException.class);
+ }
}
diff --git a/backend-java/src/test/java/com/nanri/aiimage/modules/productcategory/controller/ProductCategoryControllerCompanyScopeTest.java b/backend-java/src/test/java/com/nanri/aiimage/modules/productcategory/controller/ProductCategoryControllerCompanyScopeTest.java
index a4e22bdc6..f7259d7c1 100644
--- a/backend-java/src/test/java/com/nanri/aiimage/modules/productcategory/controller/ProductCategoryControllerCompanyScopeTest.java
+++ b/backend-java/src/test/java/com/nanri/aiimage/modules/productcategory/controller/ProductCategoryControllerCompanyScopeTest.java
@@ -47,24 +47,24 @@ class ProductCategoryControllerCompanyScopeTest {
}
@Test
- @DisplayName("列表:tab 的公司 id 交给 readCompanyId,出口给什么 service 就用什么")
+ @DisplayName("列表:tab 的公司 id 交给 readCompanyIdOrOwn,出口给什么 service 就用什么")
void listPassesTheTabValueThroughTheDoor() {
HttpServletRequest request = login();
when(adminAuthSupport.requireAdminOrInternal(request)).thenReturn(user());
- when(dataReadScope.readCompanyId(any(AdminUserEntity.class), eq(COMPANY_ID))).thenReturn(COMPANY_ID);
+ when(dataReadScope.readCompanyIdOrOwn(any(AdminUserEntity.class), eq(COMPANY_ID))).thenReturn(COMPANY_ID);
controller().list(request, "面霜", COMPANY_ID);
- verify(dataReadScope).readCompanyId(any(AdminUserEntity.class), eq(COMPANY_ID));
+ verify(dataReadScope).readCompanyIdOrOwn(any(AdminUserEntity.class), eq(COMPANY_ID));
verify(productCategoryService).list("面霜", COMPANY_ID);
}
@Test
@DisplayName("列表:非超管由出口判成\"不筛\",controller 不许自己补一个公司 id 进去")
- void listUsesTheDorsVerdictForNonSuperAdmin() {
+ void listUsesTheDoorsVerdictForNonSuperAdmin() {
HttpServletRequest request = login();
when(adminAuthSupport.requireAdminOrInternal(request)).thenReturn(user());
- when(dataReadScope.readCompanyId(any(AdminUserEntity.class), eq(COMPANY_ID))).thenReturn(null);
+ when(dataReadScope.readCompanyIdOrOwn(any(AdminUserEntity.class), eq(COMPANY_ID))).thenReturn(null);
controller().list(request, "面霜", COMPANY_ID);
@@ -76,7 +76,7 @@ class ProductCategoryControllerCompanyScopeTest {
void everyReadEndpointGoesThroughTheDoor() {
HttpServletRequest request = login();
when(adminAuthSupport.requireAdminOrInternal(request)).thenReturn(user());
- when(dataReadScope.readCompanyId(any(AdminUserEntity.class), eq(COMPANY_ID))).thenReturn(COMPANY_ID);
+ when(dataReadScope.readCompanyIdOrOwn(any(AdminUserEntity.class), eq(COMPANY_ID))).thenReturn(COMPANY_ID);
// export 的返回要真喂给 ResponseEntity.contentLength(bytes.length):mock 给 null 会 NPE 在断言之前的装配里。
when(productCategoryService.export("面霜", COMPANY_ID)).thenReturn(new byte[0]);
ProductCategoryController controller = controller();
@@ -89,7 +89,7 @@ class ProductCategoryControllerCompanyScopeTest {
verify(productCategoryService).search("面霜", 1L, 20L, COMPANY_ID);
verify(productCategoryService).export("面霜", COMPANY_ID);
verify(dataReadScope, times(3))
- .readCompanyId(any(AdminUserEntity.class), eq(COMPANY_ID));
+ .readCompanyIdOrOwn(any(AdminUserEntity.class), eq(COMPANY_ID));
}
/** 写侧口径(一期定案):归属由后端从操作者会话推导,请求体不带 company_id,controller 也不读 tab。 */
@@ -110,6 +110,39 @@ class ProductCategoryControllerCompanyScopeTest {
verifyNoInteractions(dataReadScope);
}
+ /** 写侧闸门(10-06 逐节点复验后补):读侧已经收窄,写侧不收窄="藏起来的行照样能删"。 */
+ @Test
+ @DisplayName("更新/删除:把 writeCompanyId 的判定原样交给 service,controller 不自己补公司 id")
+ void writeEndpointsPassTheRowOwnershipGate() {
+ HttpServletRequest request = login();
+ when(adminAuthSupport.requireAdminOrInternal(request)).thenReturn(user());
+ when(dataReadScope.writeCompanyId(any(AdminUserEntity.class))).thenReturn(COMPANY_ID);
+ ProductCategorySaveRequest body = new ProductCategorySaveRequest();
+ body.setName("面霜改名");
+ ProductCategoryController controller = controller();
+
+ controller.update(request, 300L, body);
+ controller.delete(request, 300L);
+
+ verify(productCategoryService).update(300L, body, COMPANY_ID);
+ verify(productCategoryService).delete(300L, COMPANY_ID);
+ }
+
+ /** 反向钉:闸门给 null(平台超管)时必须原样传 null——顺手补一个公司 id 会把超管锁死在本公司。 */
+ @Test
+ @DisplayName("更新:闸门判超管(null)时把 null 传下去,不补任何公司 id")
+ void writeGateKeepsTheSuperAdminVerdict() {
+ HttpServletRequest request = login();
+ when(adminAuthSupport.requireAdminOrInternal(request)).thenReturn(user());
+ when(dataReadScope.writeCompanyId(any(AdminUserEntity.class))).thenReturn(null);
+ ProductCategorySaveRequest body = new ProductCategorySaveRequest();
+ body.setName("内置类目改名");
+
+ controller().update(request, 10L, body);
+
+ verify(productCategoryService).update(10L, body, null);
+ }
+
private MockHttpServletRequest login() {
MockHttpServletRequest request = new MockHttpServletRequest();
request.addHeader("X-Internal-Token", "irrelevant-here");
diff --git a/backend-java/src/test/java/com/nanri/aiimage/modules/productcategory/service/ProductCategoryCompanyScopeTest.java b/backend-java/src/test/java/com/nanri/aiimage/modules/productcategory/service/ProductCategoryCompanyScopeTest.java
index bc44f1dab..b172c629a 100644
--- a/backend-java/src/test/java/com/nanri/aiimage/modules/productcategory/service/ProductCategoryCompanyScopeTest.java
+++ b/backend-java/src/test/java/com/nanri/aiimage/modules/productcategory/service/ProductCategoryCompanyScopeTest.java
@@ -29,9 +29,11 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.atLeastOnce;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoInteractions;
import static org.mockito.Mockito.when;
/**
@@ -230,7 +232,7 @@ class ProductCategoryCompanyScopeTest {
when(productCategoryMapper.selectCount(any())).thenReturn(0L);
when(productCategoryMapper.updateById(any(ProductCategoryEntity.class))).thenReturn(1);
- service.update(300L, saveRequest("面霜改名", BUILTIN_PARENT_ID));
+ service.update(300L, saveRequest("面霜改名", BUILTIN_PARENT_ID), COMPANY_ID);
LambdaQueryWrapper