分组表没有 {@code company_id} 列,归属只能从组长账号推(同 {@link #listCompanyGroupIds});
+ * 推不出来时必须报错而不是放行:把"没有组长"读成"不限公司",等于给所有无主分组开了一个越权口子。
+ */
+ private void ensureLeaderSharesOperatorCompany(Long leaderId, Long operatorId) {
+ if (leaderId == null || leaderId <= 0) {
+ throw new BusinessException("该分组没有组长账号,无法确认所属公司");
+ }
+ Long leaderCompanyId = companyScope.requireCompanyId(adminUserMapper.selectById(leaderId));
+ Long operatorCompanyId = companyScope.requireCompanyId(adminUserMapper.selectById(operatorId));
+ if (!leaderCompanyId.equals(operatorCompanyId)) {
+ throw new BusinessException("只能维护本公司的分组:组长必须与操作者同一家公司");
+ }
+ }
+
private void validateLeaderOperator(Long leaderId, Long operatorId, boolean superAdmin) {
if (superAdmin) {
return;
@@ -304,6 +363,10 @@ public class ShopManageGroupService {
AdminUserEntity operatorUser = operatorId == null ? null : adminUserMapper.selectById(operatorId);
boolean operatorCanBindAllNormals = superAdmin
|| (operatorUser != null && "admin".equalsIgnoreCase(normalizeBlank(operatorUser.getUsername())));
+ // 组长的公司 = 这个分组的公司(分组表没有 company_id 列,见 listCompanyGroupIds 的注释)
+ Long leaderCompanyId = leaderId == null || leaderId <= 0
+ ? null
+ : companyScope.requireCompanyId(adminUserMapper.selectById(leaderId));
LinkedHashSet uniqueIds = new LinkedHashSet<>();
for (Long memberUserId : memberUserIds) {
uniqueIds.add(normalizePositiveId(memberUserId, "组员用户不能为空"));
@@ -330,6 +393,18 @@ public class ShopManageGroupService {
if (leaderId != null && leaderId.equals(user.getId())) {
throw new BusinessException("组长不能作为组员重复加入分组");
}
+ // 超管(站点与公司两档)永不入组:它是那家公司的最高账号,进了组就等于把自己
+ // 关进某个组长的可见范围里。此前超管操作者能绕过这条,把别家公司的人(含别家超管)拉进分组。
+ boolean siteSuper = DeviceSessionPolicy.isSuperAdmin(
+ user.getRole(), user.getIsAdmin(), user.getCreatedById());
+ String memberRole = DeviceSessionPolicy.resolveRole(
+ user.getRole(), user.getIsAdmin(), user.getCreatedById());
+ if (siteSuper || "company_super_admin".equals(memberRole)) {
+ throw new BusinessException("超级管理员不属于任何分组");
+ }
+ if (leaderCompanyId != null && !leaderCompanyId.equals(user.getCompanyId())) {
+ throw new BusinessException("只能添加组长本公司的账号");
+ }
if (!superAdmin && !"normal".equals(normalizeBlank(user.getRole()))) {
throw new BusinessException("只能绑定普通员工账号");
}
diff --git a/backend-java/src/main/resources/db/V153__shop_manage_group_company_id.sql b/backend-java/src/main/resources/db/V153__shop_manage_group_company_id.sql
new file mode 100644
index 000000000..49fdbc2d9
--- /dev/null
+++ b/backend-java/src/main/resources/db/V153__shop_manage_group_company_id.sql
@@ -0,0 +1,102 @@
+-- =============================================================
+-- 迁移 V153__shop_manage_group_company_id
+-- 模板:docs/flyway-migration-template.md
+-- 需求:2026-10-08 客户「先锋-团队」定档「分组名同公司唯一就行」
+--
+-- 1. 变更目的:把「数据权限分组」的名称唯一性从**全平台**收窄到**同一家公司内**。
+-- 现状是 V12 建表时的 `UNIQUE KEY uk_group_name (group_name)`(全局),而分组列表按
+-- "本人是组长/组员"收窄 —— 两把尺子不同,2026-10-08 现网表现为同一屏「暂无分组」+
+-- 「分组名称已存在」:占着「先锋」这个名字的是 id=33 那行,它的组长账号 uid=1188 已被
+-- 硬删(users 无软删列),所以它在任何公司的列表里都不出现,却仍然全局占名。
+-- 收窄之后同一家人人可复用常见人名,别家同名不再互相挡路。
+--
+-- 为什么本文件不"顺手"把那两行孤儿分组改成谁的 company_id:孤儿推不出归属,
+-- 硬塞一个公司号就是"归属失真且不报错"(CompanyScopeSupport 类注释点名的形态)。
+-- 所以这一列【可空】,NULL 的语义就是「组长账号已不存在,归属无从追溯」。
+-- 副作用是好的:MySQL 唯一索引里 NULL 彼此不等价 ⇒ (NULL,'先锋') 不挡 (3,'先锋'),
+-- **迁移跑完客户立刻就能建「先锋」**,不需要先动那两行数据。
+--
+-- 2. 影响表与数据量:只有 `biz_shop_manage_group`,全表 **13 行**(2026-10-08 只读实查)。
+-- · 加列:末位、INSTANT,不重建表;
+-- · 回填:11 行能推出 company_id(组长账号在 users 里),2 行(id=33、id=34)留 NULL;
+-- · 唯一键:先 ADD `uk_company_group_name (company_id, group_name)` 再 DROP `uk_group_name`
+-- (顺序照 V145 第 3 段:中间任一步失败都至少还有一个唯一键在守并发)。
+-- 不碰 biz_shop_manage_group_member / biz_shop_manage / biz_query_asin / 任何业务数据表。
+--
+-- 3. 锁表风险:极低。13 行的表,加列走 ALGORITHM = INSTANT,两条索引变更走
+-- ALGORITHM = INPLACE, LOCK = NONE。回填 UPDATE 由本表自己驱动(13 行全扫),
+-- 不 JOIN 大表、不加 AFTER、不写 MODIFY COLUMN ... NOT NULL(重建表会按当时的列默认值
+-- 物化历史行 —— V144/V150 同款禁令,且这里根本没有可物化的默认值)。
+-- 全部语句先查 information_schema 再 PREPARE(MySQL 8.4.8 无 ADD COLUMN IF NOT EXISTS,
+-- 写法首例见 V143/V145),重跑是 no-op。
+--
+-- 4. 验证 SQL(迁移后跑,不许只看启动日志的 Successfully applied):
+-- SHOW COLUMNS FROM `biz_shop_manage_group` LIKE 'company_id';
+-- -> 期望 Null = YES,Default = NULL
+-- SHOW INDEX FROM `biz_shop_manage_group`;
+-- -> 期望有 uk_company_group_name(company_id, group_name) 两列,且【没有】uk_group_name
+-- SELECT COUNT(*) AS total, COUNT(company_id) AS filled
+-- FROM `biz_shop_manage_group`;
+-- -> 期望 total=13、filled=11(两行 NULL 是组长已删的孤儿,见第 5 段)
+-- SELECT g.`id`, g.`group_name`, g.`company_id`, u.`company_id` AS leader_company
+-- FROM `biz_shop_manage_group` g
+-- LEFT JOIN `users` u ON u.`id` = COALESCE(g.`created_by_id`, g.`user_id`)
+-- WHERE NOT (g.`company_id` <=> u.`company_id`);
+-- -> 期望只剩 id=33、id=34 两行(其余每一行的落值必须等于组长账号的公司)
+--
+-- 5. 回滚步骤:docs/rollback-V153-shop-manage-group-company-id.sql
+-- (回滚是"名字退回全平台唯一",不是"删列"——列里已写入的归属是资产,删了就回不来。)
+-- 注意:回滚前必须先手工消掉跨公司同名,否则 ADD uk_group_name 会直接 1062 失败。
+--
+-- 6. 上线窗口:随下一次 jar 发版执行(两台必须同版,Flyway 只在先到的一台上跑)。
+-- 业务低峰即可:13 行的表,没有需要等的长事务。
+-- 写侧代码(create/update 显式落 company_id、重名校验按公司筛)与本版【同批】上线:
+-- 只上迁移不上代码,表现是"新行 company_id 全 NULL",隔离等于没做;
+-- 只上代码不上迁移,表现是新代码撞库级 uk_group_name ⇒ 500。两个方向都不许单独发。
+-- =============================================================
+
+SET @db_name = DATABASE();
+
+-- ---------- 1. 加列(末位 + INSTANT;可空,NULL = 归属无从追溯) ----------
+
+SET @col_exists := (SELECT COUNT(*) FROM information_schema.COLUMNS
+ WHERE TABLE_SCHEMA = @db_name AND TABLE_NAME = 'biz_shop_manage_group' AND COLUMN_NAME = 'company_id');
+SET @sql := IF(@col_exists = 0,
+ 'ALTER TABLE `biz_shop_manage_group` ADD COLUMN `company_id` bigint NULL DEFAULT NULL COMMENT ''归属公司(company.id):写入时由组长账号推导;NULL=组长账号已不存在、归属无从追溯;V153'', ALGORITHM = INSTANT',
+ 'SELECT 1');
+PREPARE stmt FROM @sql;
+EXECUTE stmt;
+DEALLOCATE PREPARE stmt;
+
+-- ---------- 2. 回填:组长账号(新列 created_by_id 优先、旧列 user_id 兜底)的公司 ----------
+-- 两列一起认是这张表既定的口径(生产 13 行里 2 行的组长只落在旧列 user_id 上,
+-- 只认 created_by_id 会把它们当成"无组长"从而留 NULL,而它们其实有明确归属)。
+-- 驱动方向:本表 13 行全扫,按 users 主键点查,不碰 users 的索引选择。
+
+UPDATE `biz_shop_manage_group` g
+ JOIN `users` u ON u.`id` = COALESCE(g.`created_by_id`, g.`user_id`)
+ SET g.`company_id` = u.`company_id`
+ WHERE g.`company_id` IS NULL
+ AND u.`company_id` IS NOT NULL;
+
+-- ---------- 3. 唯一键按公司放宽(先 ADD 后 DROP,理由见头注释第 2 段) ----------
+
+SET @idx_exists := (SELECT COUNT(DISTINCT INDEX_NAME) FROM information_schema.STATISTICS
+ WHERE TABLE_SCHEMA = @db_name AND TABLE_NAME = 'biz_shop_manage_group'
+ AND INDEX_NAME = 'uk_company_group_name');
+SET @sql := IF(@idx_exists = 0,
+ 'ALTER TABLE `biz_shop_manage_group` ADD UNIQUE KEY `uk_company_group_name` (`company_id`, `group_name`), ALGORITHM = INPLACE, LOCK = NONE',
+ 'SELECT 1');
+PREPARE stmt FROM @sql;
+EXECUTE stmt;
+DEALLOCATE PREPARE stmt;
+
+SET @idx_exists := (SELECT COUNT(DISTINCT INDEX_NAME) FROM information_schema.STATISTICS
+ WHERE TABLE_SCHEMA = @db_name AND TABLE_NAME = 'biz_shop_manage_group'
+ AND INDEX_NAME = 'uk_group_name');
+SET @sql := IF(@idx_exists > 0,
+ 'ALTER TABLE `biz_shop_manage_group` DROP INDEX `uk_group_name`, ALGORITHM = INPLACE, LOCK = NONE',
+ 'SELECT 1');
+PREPARE stmt FROM @sql;
+EXECUTE stmt;
+DEALLOCATE PREPARE stmt;
diff --git a/backend-java/src/test/java/com/nanri/aiimage/modules/dedupe/service/DedupeTotalDataCompanySuperAdminGroupAccessTest.java b/backend-java/src/test/java/com/nanri/aiimage/modules/dedupe/service/DedupeTotalDataCompanySuperAdminGroupAccessTest.java
new file mode 100644
index 000000000..ce9baa20b
--- /dev/null
+++ b/backend-java/src/test/java/com/nanri/aiimage/modules/dedupe/service/DedupeTotalDataCompanySuperAdminGroupAccessTest.java
@@ -0,0 +1,133 @@
+package com.nanri.aiimage.modules.dedupe.service;
+
+import com.nanri.aiimage.common.exception.BusinessException;
+import com.nanri.aiimage.common.mapper.AdminUserMapper;
+import com.nanri.aiimage.common.mapper.ShopManageGroupMapper;
+import com.nanri.aiimage.common.model.entity.AdminUserEntity;
+import com.nanri.aiimage.common.model.entity.ShopManageGroupEntity;
+import com.nanri.aiimage.common.service.CompanyScopeSupport;
+import com.nanri.aiimage.modules.dedupe.mapper.DedupeTotalDataMapper;
+import com.nanri.aiimage.modules.shopkey.service.ShopManageGroupService;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.http.HttpStatus;
+import org.springframework.test.util.ReflectionTestUtils;
+import org.springframework.web.server.ResponseStatusException;
+
+import java.util.List;
+import java.util.Set;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.mockito.Mockito.when;
+
+/**
+ * 公司超级管理员在「按分组读写去重总数据」这条链上的闸门(2026-10-08 客户现网报 403)。
+ *
+ * 客户账号 uid=1206(company_id=3)自己建了分组 id=36,后台下拉能选到它,点「上传并导入」
+ * 得到的是 axios 那句 {@code Request failed with status code 403}——因为写侧闸门
+ * {@code resolveAccessibleGroup} 只认 {@code allUsers} 与 {@code groupIds},而公司超管那一支
+ * {@code AccessScope} 过去只填了 {@code userIds + wholeCompany}(读侧用),groupIds 是空集。
+ * 读侧有 {@code wholeCompany} 兜着所以列表是好的,两边不对称就是"看得到、动不了"。
+ *
+ * 断言打在闸门的行为上(抛不抛)而不是打在集合内容上:把 {@code resolveAccessScope} 里补
+ * groupIds 那一行删掉,前两条用例必须一红一松手;把 {@code listCompanyGroupIds} 换成"不筛公司"
+ * 则第三条必须红——这两向都红才说明这一行真的在执行口径,而不是恰好没被走到。
+ */
+@ExtendWith(MockitoExtension.class)
+class DedupeTotalDataCompanySuperAdminGroupAccessTest {
+
+ private static final long OPERATOR_ID = 1206L;
+ private static final long OWN_COMPANY_ID = 3L;
+ private static final long OWN_COMPANY_GROUP_ID = 36L;
+ private static final long OTHER_COMPANY_GROUP_ID = 33L;
+
+ @Mock
+ private DedupeTotalDataMapper dedupeTotalDataMapper;
+ @Mock
+ private AdminUserMapper adminUserMapper;
+ @Mock
+ private ShopManageGroupMapper shopManageGroupMapper;
+ @Mock
+ private ShopManageGroupService shopManageGroupService;
+ @Mock
+ private CompanyScopeSupport companyScopeSupport;
+
+ @InjectMocks
+ private DedupeTotalDataService service;
+
+ private void stubCompanySuperAdmin() {
+ AdminUserEntity operator = new AdminUserEntity();
+ operator.setId(OPERATOR_ID);
+ operator.setUsername("u1206");
+ operator.setRole("company_super_admin");
+ operator.setIsAdmin(1);
+ operator.setCompanyId(OWN_COMPANY_ID);
+ when(adminUserMapper.selectById(OPERATOR_ID)).thenReturn(operator);
+ when(companyScopeSupport.memberUserIds(OWN_COMPANY_ID)).thenReturn(List.of(OPERATOR_ID));
+ }
+
+ private void stubGroup(Long groupId) {
+ ShopManageGroupEntity group = new ShopManageGroupEntity();
+ group.setId(groupId);
+ group.setGroupName("g" + groupId);
+ when(shopManageGroupMapper.selectById(groupId)).thenReturn(group);
+ }
+
+ private ShopManageGroupEntity resolveWritableGroup(Long groupId) {
+ AdminUserEntity operator = new AdminUserEntity();
+ operator.setId(OPERATOR_ID);
+ operator.setRole("company_super_admin");
+ operator.setCompanyId(OWN_COMPANY_ID);
+ return ReflectionTestUtils.invokeMethod(service, "resolveWritableGroup", groupId, operator);
+ }
+
+ @Test
+ @DisplayName("公司超管写本公司名下的分组:闸门放行(修复前这里必 403)")
+ void companySuperAdminWritesGroupOfOwnCompany() {
+ stubCompanySuperAdmin();
+ stubGroup(OWN_COMPANY_GROUP_ID);
+ when(shopManageGroupService.listCompanyGroupIds(List.of(OPERATOR_ID)))
+ .thenReturn(Set.of(OWN_COMPANY_GROUP_ID));
+
+ assertThat(resolveWritableGroup(OWN_COMPANY_GROUP_ID).getId()).isEqualTo(OWN_COMPANY_GROUP_ID);
+ }
+
+ @Test
+ @DisplayName("公司超管查导入任务进度走同一把尺子:不再报「无权查看该导入任务」")
+ void importTaskAccessUsesSameRuler() {
+ stubCompanySuperAdmin();
+ when(shopManageGroupService.listCompanyGroupIds(List.of(OPERATOR_ID)))
+ .thenReturn(Set.of(OWN_COMPANY_GROUP_ID));
+
+ ReflectionTestUtils.invokeMethod(service, "ensureImportTaskAccess", OWN_COMPANY_GROUP_ID,
+ ReflectionTestUtils.invokeMethod(service, "resolveAccessScope", OPERATOR_ID));
+ }
+
+ @Test
+ @DisplayName("别家公司的分组仍然 403:补 groupIds 不等于把闸门放开成全平台")
+ void groupOfAnotherCompanyStillForbidden() {
+ stubCompanySuperAdmin();
+ stubGroup(OTHER_COMPANY_GROUP_ID);
+ // 组长不在本公司成员集里 ⇒ listCompanyGroupIds 不会返回它
+ when(shopManageGroupService.listCompanyGroupIds(List.of(OPERATOR_ID))).thenReturn(Set.of());
+
+ assertThatThrownBy(() -> resolveWritableGroup(OTHER_COMPANY_GROUP_ID))
+ .isInstanceOfSatisfying(ResponseStatusException.class, ex -> {
+ assertThat(ex.getStatusCode()).isEqualTo(HttpStatus.FORBIDDEN);
+ assertThat(ex.getReason()).isEqualTo("无权操作该分组数据");
+ });
+ }
+
+ @Test
+ @DisplayName("分组 id 缺失仍走中文业务错误,不被公司维度兜成放行")
+ void missingGroupStillRejectedBeforeScope() {
+ assertThatThrownBy(() -> resolveWritableGroup(0L))
+ .isInstanceOf(BusinessException.class)
+ .hasMessage("请选择分组");
+ }
+}
diff --git a/backend-java/src/test/java/com/nanri/aiimage/modules/shopkey/service/ShopManageGroupCompanyNameUniquenessTest.java b/backend-java/src/test/java/com/nanri/aiimage/modules/shopkey/service/ShopManageGroupCompanyNameUniquenessTest.java
new file mode 100644
index 000000000..8c59f4444
--- /dev/null
+++ b/backend-java/src/test/java/com/nanri/aiimage/modules/shopkey/service/ShopManageGroupCompanyNameUniquenessTest.java
@@ -0,0 +1,260 @@
+package com.nanri.aiimage.modules.shopkey.service;
+
+import com.baomidou.mybatisplus.core.MybatisConfiguration;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.TableInfoHelper;
+import com.nanri.aiimage.common.exception.BusinessException;
+import com.nanri.aiimage.common.mapper.AdminUserMapper;
+import com.nanri.aiimage.common.mapper.ShopManageGroupMapper;
+import com.nanri.aiimage.common.model.entity.AdminUserEntity;
+import com.nanri.aiimage.common.model.entity.ShopManageGroupEntity;
+import com.nanri.aiimage.common.service.CompanyScopeSupport;
+import com.nanri.aiimage.modules.shopkey.mapper.ShopManageGroupMemberMapper;
+import com.nanri.aiimage.modules.shopkey.model.dto.ShopManageGroupCreateRequest;
+import com.nanri.aiimage.modules.shopkey.model.dto.ShopManageGroupUpdateRequest;
+import com.nanri.aiimage.modules.shopkey.model.entity.ShopManageGroupMemberEntity;
+import org.apache.ibatis.builder.MapperBuilderAssistant;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
+import org.springframework.test.util.ReflectionTestUtils;
+
+import java.util.List;
+import java.util.concurrent.atomic.AtomicReference;
+
+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.verify;
+import static org.mockito.Mockito.when;
+
+/**
+ * 分组名的唯一性范围(V153 起:同一家公司内唯一,2026-10-08 定档)。
+ *
+ * 要防的是两种"错了不报错"的形状:
+ *
+ * - 写侧漏落 company_id:这一列是 NULL 的分组会被所有公司的 tab 排除在外,
+ * 而 MyBatis-Plus 对 null 字段直接不出现在 INSERT 列清单里 ⇒ 静默落库成 NULL。
+ * 所以断言打在送进 insert/updateById 的那个实体上,不是打在方法没抛异常上。
+ * - 校验用 eq(col, null) 而不是 isNull:{@code company_id = NULL} 在 MySQL 里恒不成立,
+ * 于是"查占用者"永远查不到,这条校验整支形同删掉——而它长得像在工作。
+ *
+ *
+ * SQL 片段字面量取自媒体实跑(脱敏后逐字),不是推理;{@code paramNameValuePairs} 必须在
+ * {@code getSqlSegment()} 求值之后再读,否则断的是一个空 map。
+ */
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
+class ShopManageGroupCompanyNameUniquenessTest {
+
+ private static final Long LEADER_ID = 1206L;
+ private static final Long OPERATOR_ID = 1206L;
+ private static final Long COMPANY_ID = 3L;
+ private static final Long OTHER_COMPANY_ID = 1L;
+
+ private ShopManageGroupMapper groupMapper;
+ private ShopManageGroupMemberMapper memberMapper;
+ private AdminUserMapper userMapper;
+ private CompanyScopeSupport companyScope;
+ private ShopManageGroupService service;
+
+ @Mock
+ private com.nanri.aiimage.modules.shopkey.mapper.ShopManageMapper shopManageMapper;
+
+ @BeforeEach
+ void setUp() {
+ TableInfoHelper.initTableInfo(new MapperBuilderAssistant(new MybatisConfiguration(), ""),
+ ShopManageGroupEntity.class);
+ TableInfoHelper.initTableInfo(new MapperBuilderAssistant(new MybatisConfiguration(), ""),
+ ShopManageGroupMemberEntity.class);
+ groupMapper = org.mockito.Mockito.mock(ShopManageGroupMapper.class);
+ memberMapper = org.mockito.Mockito.mock(ShopManageGroupMemberMapper.class);
+ userMapper = org.mockito.Mockito.mock(AdminUserMapper.class);
+ companyScope = org.mockito.Mockito.mock(CompanyScopeSupport.class);
+ service = new ShopManageGroupService(groupMapper, memberMapper, List.of(), shopManageMapper,
+ null, null, userMapper, companyScope);
+ // 打桩照 CompanyScopeSupport 的真实语义来:取不到公司就抛,而不是把 null 传下去。
+ // 上一版这里直接回传 getCompanyId(),结果 null 一路走到别人的 equals 里 NPE,
+ // 测出来的是"桩不像真实现",不是被测代码的缺陷。
+ when(companyScope.requireCompanyId(any(AdminUserEntity.class))).thenAnswer(invocation -> {
+ AdminUserEntity account = invocation.getArgument(0);
+ if (account == null || account.getCompanyId() == null || account.getCompanyId() <= 0) {
+ throw new BusinessException("归属账号不存在或没有所属公司");
+ }
+ return account.getCompanyId();
+ });
+ }
+
+ private AdminUserEntity user(Long id, String role, Long companyId) {
+ AdminUserEntity user = new AdminUserEntity();
+ user.setId(id);
+ user.setUsername("u" + id);
+ user.setRole(role);
+ user.setIsAdmin("normal".equals(role) ? 0 : 1);
+ user.setCompanyId(companyId);
+ return user;
+ }
+
+ /** 脱敏:MP 在 segment 里只放 {@code #{ew.paramNameValuePairs.MPGENVALn}} 占位,值单独断。 */
+ private static String masked(String segment) {
+ String sql = segment.replaceAll("#\\{ew\\.paramNameValuePairs\\.MPGENVAL\\d+}", "?");
+ assertThat(sql).as("脱敏必须把每个 MP 占位符都换成 ?").doesNotContain("MPGENVAL").doesNotContain("#{");
+ return sql;
+ }
+
+ @SuppressWarnings({"unchecked", "rawtypes"})
+ private LambdaQueryWrapper captureCountQuery() {
+ ArgumentCaptor captor = ArgumentCaptor.forClass(LambdaQueryWrapper.class);
+ verify(groupMapper).selectCount(captor.capture());
+ return (LambdaQueryWrapper) captor.getValue();
+ }
+
+ private void stubEmptyNameSlot() {
+ when(groupMapper.selectCount(any())).thenReturn(0L);
+ }
+
+ // ---------- 1. 校验查询必须带公司谓词 ----------
+
+ @Test
+ @DisplayName("重名校验:按公司筛,实测渲染逐字比对")
+ void duplicateCheckIsScopedByCompany() {
+ stubEmptyNameSlot();
+
+ ReflectionTestUtils.invokeMethod(service, "ensureGroupNameUnique", "先锋", null, COMPANY_ID);
+
+ LambdaQueryWrapper query = captureCountQuery();
+ String sql = masked(query.getSqlSegment());
+ assertThat(sql).as("名字与公司两条腿都必须 AND 在一起")
+ .isEqualTo("(group_name = ? AND company_id = ?)");
+ // 先求值 segment 再读 pairs,否则断的是空 map。绑定顺序由 MP 决定,不假设它跟片段同序。
+ assertThat(query.getParamNameValuePairs().values())
+ .containsExactlyInAnyOrder("先锋", COMPANY_ID);
+ }
+
+ @Test
+ @DisplayName("重名校验:归属为 NULL 时必须走 IS NULL,不能渲染成 company_id = NULL(恒不成立=校验形同删掉)")
+ void nullCompanyUsesIsNullNotEqualsNull() {
+ stubEmptyNameSlot();
+
+ ReflectionTestUtils.invokeMethod(service, "ensureGroupNameUnique", "先锋", null, null);
+
+ LambdaQueryWrapper query = captureCountQuery();
+ String sql = masked(query.getSqlSegment());
+ assertThat(sql).as("NULL 归属要按 IS NULL 比,而不是绑一个 null 进去")
+ .isEqualTo("(group_name = ? AND company_id IS NULL)");
+ assertThat(sql).as("绝不允许出现 company_id = ? 且绑定值是 null 的形状")
+ .doesNotContain("company_id = ?");
+ assertThat(query.getParamNameValuePairs().values()).containsExactly("先锋");
+ }
+
+ @Test
+ @DisplayName("重名校验:本公司内已存在才报,且文案不说\"全平台\"(V153 之后那句是假话)")
+ void messageSpeaksCompanyScopeOnly() {
+ when(groupMapper.selectCount(any())).thenReturn(1L);
+
+ assertThatThrownBy(() -> ReflectionTestUtils.invokeMethod(
+ service, "ensureGroupNameUnique", "先锋", 36L, COMPANY_ID))
+ .isInstanceOf(BusinessException.class)
+ .hasMessageContaining("本公司")
+ .hasMessageNotContaining("全平台");
+ }
+
+ @Test
+ @DisplayName("重名校验:编辑自己时把自己排除在外(否则任何一次改名都自撞)")
+ void updateExcludesOwnRow() {
+ stubEmptyNameSlot();
+
+ ReflectionTestUtils.invokeMethod(service, "ensureGroupNameUnique", "先锋", 36L, COMPANY_ID);
+
+ LambdaQueryWrapper query = captureCountQuery();
+ assertThat(masked(query.getSqlSegment()))
+ .isEqualTo("(group_name = ? AND company_id = ? AND id <> ?)");
+ assertThat(query.getParamNameValuePairs().values())
+ .containsExactlyInAnyOrder("先锋", COMPANY_ID, 36L);
+ }
+
+ // ---------- 2. 写侧必须把 company_id 落进去 ----------
+
+ @Test
+ @DisplayName("建组:INSERT 的实体带 company_id(从组长账号推),漏落就会静默造出孤儿行")
+ void createPersistsCompanyFromLeader() {
+ stubEmptyNameSlot();
+ when(userMapper.selectById(LEADER_ID)).thenReturn(user(LEADER_ID, "company_super_admin", COMPANY_ID));
+ AtomicReference inserted = new AtomicReference<>();
+ when(groupMapper.insert(any(ShopManageGroupEntity.class))).thenAnswer(invocation -> {
+ ShopManageGroupEntity entity = invocation.getArgument(0);
+ // 真库里 insert 后主键由自增回填,create() 末尾会 selectById(id) 再回显。
+ // 桩不填 id 的话 toVoList 拿 null 去查成员,测到的是桩不像真实现。
+ entity.setId(36L);
+ inserted.set(entity);
+ return 1;
+ });
+ when(groupMapper.selectById(any())).thenAnswer(invocation -> inserted.get());
+ // toVoList 会按组长/组员 id 批量取账号回显用户名,桩不给就 NPE 在回显上,
+ // 而这条用例要断的是"送进 insert 的那个实体带没带 company_id"。
+ when(userMapper.selectBatchIds(any()))
+ .thenReturn(List.of(user(LEADER_ID, "company_super_admin", COMPANY_ID)));
+
+ ShopManageGroupCreateRequest request = new ShopManageGroupCreateRequest();
+ request.setGroupName("先锋");
+ request.setCreatedById(LEADER_ID);
+ request.setMemberUserIds(List.of());
+ service.create(request, OPERATOR_ID, false);
+
+ assertThat(inserted.get().getCompanyId()).as("归属必须随建组一次定死").isEqualTo(COMPANY_ID);
+ assertThat(inserted.get().getGroupName()).isEqualTo("先锋");
+ }
+
+ @Test
+ @DisplayName("建组:组长账号没有公司 ⇒ 抛,不允许落成 NULL 继续写")
+ void createRejectsLeaderWithoutCompany() {
+ when(userMapper.selectById(LEADER_ID)).thenReturn(user(LEADER_ID, "company_super_admin", null));
+
+ ShopManageGroupCreateRequest request = new ShopManageGroupCreateRequest();
+ request.setGroupName("先锋");
+ request.setCreatedById(LEADER_ID);
+ request.setMemberUserIds(List.of());
+
+ assertThatThrownBy(() -> service.create(request, OPERATOR_ID, false))
+ .isInstanceOf(BusinessException.class);
+ verify(groupMapper, org.mockito.Mockito.never()).insert(any(ShopManageGroupEntity.class));
+ }
+
+ @Test
+ @DisplayName("改名:按组长当前公司回写,组长被移去别家时这一列跟着纠回来(落值漂移的自愈点)")
+ void renameRewritesCompanyFromCurrentLeader() {
+ stubEmptyNameSlot();
+ ShopManageGroupEntity stored = new ShopManageGroupEntity();
+ stored.setId(36L);
+ stored.setGroupName("先锋1");
+ stored.setCreatedById(LEADER_ID);
+ stored.setCompanyId(OTHER_COMPANY_ID); // 落值还是老公司 —— 模拟"移人"之后
+ when(groupMapper.selectById(36L)).thenReturn(stored);
+ when(userMapper.selectById(LEADER_ID)).thenReturn(user(LEADER_ID, "company_super_admin", COMPANY_ID));
+ AtomicReference updated = new AtomicReference<>();
+ when(groupMapper.updateById(any(ShopManageGroupEntity.class))).thenAnswer(invocation -> {
+ updated.set(invocation.getArgument(0));
+ return 1;
+ });
+
+ ShopManageGroupUpdateRequest request = new ShopManageGroupUpdateRequest();
+ request.setGroupName("先锋");
+ request.setMemberUserIds(List.of());
+ service.update(36L, OPERATOR_ID, false, request);
+
+ assertThat(updated.get().getCompanyId()).as("改名必须顺手把归属纠回组长当前公司").isEqualTo(COMPANY_ID);
+ assertThat(updated.get().getGroupName()).isEqualTo("先锋");
+ // 校验查询用的是纠回来之后的公司,不是那一列的旧值(改名场景自带 id <> 自己)
+ LambdaQueryWrapper check = captureCountQuery();
+ String sql = masked(check.getSqlSegment());
+ assertThat(sql).isEqualTo("(group_name = ? AND company_id = ? AND id <> ?)");
+ assertThat(check.getParamNameValuePairs().values()).contains(COMPANY_ID);
+ assertThat(check.getParamNameValuePairs().values()).doesNotContain(OTHER_COMPANY_ID);
+ }
+}
diff --git a/backend-java/src/test/java/com/nanri/aiimage/modules/shopkey/service/ShopManageGroupCompanyScopeTest.java b/backend-java/src/test/java/com/nanri/aiimage/modules/shopkey/service/ShopManageGroupCompanyScopeTest.java
new file mode 100644
index 000000000..45194cf4a
--- /dev/null
+++ b/backend-java/src/test/java/com/nanri/aiimage/modules/shopkey/service/ShopManageGroupCompanyScopeTest.java
@@ -0,0 +1,155 @@
+package com.nanri.aiimage.modules.shopkey.service;
+
+import com.baomidou.mybatisplus.core.MybatisConfiguration;
+import com.baomidou.mybatisplus.core.metadata.TableInfoHelper;
+import com.nanri.aiimage.common.exception.BusinessException;
+import com.nanri.aiimage.common.mapper.AdminUserMapper;
+import com.nanri.aiimage.common.mapper.ShopManageGroupMapper;
+import com.nanri.aiimage.common.model.entity.AdminUserEntity;
+import com.nanri.aiimage.common.model.entity.ShopManageGroupEntity;
+import com.nanri.aiimage.common.service.CompanyScopeSupport;
+import com.nanri.aiimage.modules.shopkey.mapper.ShopManageGroupMemberMapper;
+import com.nanri.aiimage.modules.shopkey.model.dto.ShopManageGroupCreateRequest;
+import com.nanri.aiimage.modules.shopkey.model.entity.ShopManageGroupMemberEntity;
+import org.apache.ibatis.builder.MapperBuilderAssistant;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.mockito.ArgumentCaptor;
+
+import java.util.List;
+
+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.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+/**
+ * 分组的归属边界(2026-10-07 定案):与建号那条同一口径——站点超管不替其他公司管分组,
+ * 而超管(站点与公司两档)不属于任何分组。
+ *
+ * 分组表没有 {@code company_id} 列,归属只能从组长账号推,所以这里的断言全部打在
+ * 「组长/组员的 company_id 有没有被真的比过」上,而不是打在角色字符串上:把
+ * {@code ensureLeaderSharesOperatorCompany} 那一行删掉,四条用例必须同时松手。
+ */
+class ShopManageGroupCompanyScopeTest {
+
+ private ShopManageGroupMapper groupMapper;
+ private ShopManageGroupMemberMapper memberMapper;
+ private AdminUserMapper userMapper;
+ private CompanyScopeSupport companyScope;
+ private ShopManageGroupService service;
+
+ @BeforeEach
+ void setUp() {
+ TableInfoHelper.initTableInfo(new MapperBuilderAssistant(new MybatisConfiguration(), ""),
+ ShopManageGroupEntity.class);
+ TableInfoHelper.initTableInfo(new MapperBuilderAssistant(new MybatisConfiguration(), ""),
+ ShopManageGroupMemberEntity.class);
+ groupMapper = mock(ShopManageGroupMapper.class);
+ memberMapper = mock(ShopManageGroupMemberMapper.class);
+ userMapper = mock(AdminUserMapper.class);
+ companyScope = mock(CompanyScopeSupport.class);
+ service = new ShopManageGroupService(groupMapper, memberMapper, List.of(), null, null, null,
+ userMapper, companyScope);
+ // 真实实现就是「取账号自己的 company_id,取不到就抛」,这里按同一语义打桩而不是逐个用例喂值
+ when(companyScope.requireCompanyId(any(AdminUserEntity.class))).thenAnswer(invocation ->
+ invocation.getArgument(0, AdminUserEntity.class).getCompanyId());
+ }
+
+ private AdminUserEntity user(Long id, String role, Long companyId) {
+ AdminUserEntity user = new AdminUserEntity();
+ user.setId(id);
+ user.setUsername("u" + id);
+ user.setRole(role);
+ user.setIsAdmin("normal".equals(role) ? 0 : 1);
+ user.setCompanyId(companyId);
+ return user;
+ }
+
+ private ShopManageGroupCreateRequest request(Long leaderId, List memberIds) {
+ ShopManageGroupCreateRequest request = new ShopManageGroupCreateRequest();
+ request.setGroupName("g-" + leaderId + "-" + memberIds);
+ request.setCreatedById(leaderId);
+ request.setMemberUserIds(memberIds);
+ return request;
+ }
+
+ @Test
+ @DisplayName("建组:站点超管不能替别家公司建分组——组长是别家的人就挡下,且一行不写")
+ void superAdminCannotCreateGroupForAnotherCompany() {
+ when(userMapper.selectById(1L)).thenReturn(user(1L, "super_admin", 1L));
+ when(userMapper.selectById(50L)).thenReturn(user(50L, "admin", 7L));
+
+ assertThatThrownBy(() -> service.create(request(50L, List.of()), 1L, true))
+ .isInstanceOfSatisfying(BusinessException.class, ex ->
+ assertThat(ex.getMessage()).contains("本公司"));
+ verify(groupMapper, never()).insert(any(ShopManageGroupEntity.class));
+ }
+
+ @Test
+ @DisplayName("组员:公司超管永不入组,站点超管操作者也绕不过这一条")
+ void companySuperAdminNeverBecomesMember() {
+ when(userMapper.selectById(1L)).thenReturn(user(1L, "super_admin", 1L));
+ when(userMapper.selectById(50L)).thenReturn(user(50L, "admin", 1L));
+ when(userMapper.selectBatchIds(any())).thenReturn(List.of(user(60L, "company_super_admin", 1L)));
+
+ assertThatThrownBy(() -> service.create(request(50L, List.of(60L)), 1L, true))
+ .isInstanceOfSatisfying(BusinessException.class, ex ->
+ assertThat(ex.getMessage()).isEqualTo("超级管理员不属于任何分组"));
+ verify(memberMapper, never()).insert(any(ShopManageGroupMemberEntity.class));
+ }
+
+ @Test
+ @DisplayName("组员:站点超管账号同样不得入组(老实现只在非超管分支才查这一条)")
+ void siteSuperAdminNeverBecomesMember() {
+ when(userMapper.selectById(1L)).thenReturn(user(1L, "super_admin", 1L));
+ when(userMapper.selectById(50L)).thenReturn(user(50L, "admin", 1L));
+ when(userMapper.selectBatchIds(any())).thenReturn(List.of(user(61L, "super_admin", 1L)));
+
+ assertThatThrownBy(() -> service.create(request(50L, List.of(61L)), 1L, true))
+ .isInstanceOfSatisfying(BusinessException.class, ex ->
+ assertThat(ex.getMessage()).isEqualTo("超级管理员不属于任何分组"));
+ }
+
+ @Test
+ @DisplayName("组员:别家公司的普通账号不能拉进本公司分组(超管操作者以前能)")
+ void memberMustShareLeaderCompany() {
+ when(userMapper.selectById(1L)).thenReturn(user(1L, "super_admin", 1L));
+ when(userMapper.selectById(50L)).thenReturn(user(50L, "admin", 1L));
+ when(userMapper.selectBatchIds(any())).thenReturn(List.of(user(62L, "normal", 7L)));
+
+ assertThatThrownBy(() -> service.create(request(50L, List.of(62L)), 1L, true))
+ .isInstanceOfSatisfying(BusinessException.class, ex ->
+ assertThat(ex.getMessage()).contains("本公司"));
+ verify(memberMapper, never()).insert(any(ShopManageGroupMemberEntity.class));
+ }
+
+ @Test
+ @DisplayName("正样本配对:本公司组长 + 本公司普通员工照常落库——上面四条 never 只有这条成立才有东西可反证")
+ void sameCompanyLeaderAndMemberAreSaved() {
+ when(userMapper.selectById(1L)).thenReturn(user(1L, "super_admin", 1L));
+ when(userMapper.selectById(50L)).thenReturn(user(50L, "admin", 1L));
+ when(userMapper.selectBatchIds(any())).thenReturn(List.of(user(63L, "normal", 1L)));
+ when(groupMapper.insert(any(ShopManageGroupEntity.class))).thenAnswer(invocation -> {
+ invocation.getArgument(0, ShopManageGroupEntity.class).setId(9L);
+ return 1;
+ });
+ ShopManageGroupEntity saved = new ShopManageGroupEntity();
+ saved.setId(9L);
+ saved.setGroupName("saved");
+ saved.setCreatedById(50L);
+ when(groupMapper.selectById(9L)).thenReturn(saved);
+
+ service.create(request(50L, List.of(63L)), 1L, true);
+
+ ArgumentCaptor captor =
+ ArgumentCaptor.forClass(ShopManageGroupMemberEntity.class);
+ verify(memberMapper).insert(captor.capture());
+ assertThat(captor.getValue().getUserId()).isEqualTo(63L);
+ assertThat(captor.getValue().getGroupId()).isEqualTo(9L);
+ }
+}
diff --git a/backend-java/src/test/java/com/nanri/aiimage/modules/shopkey/service/ShopManageGroupServiceTest.java b/backend-java/src/test/java/com/nanri/aiimage/modules/shopkey/service/ShopManageGroupServiceTest.java
index 542746d29..01808c93a 100644
--- a/backend-java/src/test/java/com/nanri/aiimage/modules/shopkey/service/ShopManageGroupServiceTest.java
+++ b/backend-java/src/test/java/com/nanri/aiimage/modules/shopkey/service/ShopManageGroupServiceTest.java
@@ -47,9 +47,11 @@ import static org.mockito.Mockito.when;
@ExtendWith(MockitoExtension.class)
class ShopManageGroupServiceTest {
- /** 实跑(MP 3.5.7,TableInfo 手工初始化)打出来的 {@code list(5L, List.of(11L))} 脱敏整串:每个字符都取自媒体,不是推测。 */
+ /** 实跑(MP 3.5.7,TableInfo 手工初始化)打出来的 {@code list(5L, List.of(11L))} 脱敏整串:每个字符都取自媒体,不是推测。
+ * 2026-10-08:公司那一腿从 {@code created_by_id IN (?)} 长成两列一起认(生产 13 个分组里 2 个的组长
+ * 只落在旧列 user_id 上,单列筛会把它们从每一个公司 tab 里静默删掉),与 {@code listCompanyGroupIds} 对齐。 */
private static final String OR_GROUP_MASKED =
- "((created_by_id = ? OR (user_id = ?)) AND (created_by_id IN (?))) ORDER BY id ASC";
+ "((created_by_id = ? OR (user_id = ?)) AND (created_by_id IN (?) OR (user_id IN (?)))) ORDER BY id ASC";
/** M2(I-1 点名的那个形状)实测渲染出来的样子:OR 的左半边逃出括号组。整串比对对它必红。 */
private static final String FLAT_OR_MASKED =
@@ -110,8 +112,8 @@ class ShopManageGroupServiceTest {
assertThat(sql).contains(" OR ").contains(" IN (");
assertThat(q.getParamNameValuePairs().values())
- .as("三个占位符 = created_by_id / user_id / 公司成员集各一个绑定")
- .hasSize(3)
+ .as("四个占位符 = created_by_id / user_id 各一个绑定 + 公司成员集两列各一个绑定")
+ .hasSize(4)
.contains(5L, 11L);
}
diff --git a/frontend-vue/src/pages/login/DesktopLoginPage.vue b/frontend-vue/src/pages/login/DesktopLoginPage.vue
index 7eb3ae7d8..e6ca79a85 100644
--- a/frontend-vue/src/pages/login/DesktopLoginPage.vue
+++ b/frontend-vue/src/pages/login/DesktopLoginPage.vue
@@ -51,6 +51,7 @@
登录
该账号已在其他设备登录,本设备已下线。如非本人操作,请及时修改密码。
+
登录状态已失效(登录凭证过期,或该账号已被管理员删除),请重新登录。
{{ errorMessage }}