fix(jd): 京东分组作用域两条取组 SQL 补 platform 投影——平台闸读不到平台档把全部组(含 jd 档)判非 jd 清空,平台超管建组建成功京东侧永不显示(2026-11-17 用户截图「咋没显示」实录)。selectAllGroups/selectLedGroups 各补 g.platform AS platform(selectAllGroups 上次 47fc0e08 补 company_id 同一条查询同款病);selectLedGroups 按先例整行摘迁移等价账本点名 NOT_MIGRATED(LEDGER_ROWS 82→81/SELECTS 58→57);ShopManageGroupScopeSqlTest 升级双事故绊线:超管投影钉 company_id+platform 两列、新增组长档投影格。判据:投影缺任一列即红(mock 掉 mapper 的服务用例照旧绿——这正是两连漏的成因);mvn -o test 三类 22 例全绿

This commit is contained in:
2026-11-17 21:08:59 +08:00
parent 2a0cc86572
commit d850c46f46
4 changed files with 43 additions and 13 deletions
@@ -56,8 +56,11 @@
WHERE accessible_group_id IS NOT NULL
ORDER BY accessible_group_id ASC
</select>
<!-- platform 列(2026-11-17):JdCategoryScopeService.retainJdPlatformGroups 只认本投影读出的
platform,少了这列每行都是 null ⇒ 平台闸把全部分组(含 jd 档)判成非 jd 清空——
与下面 selectLedGroups 同病,投影契约由 ShopManageGroupScopeSqlTest 钉。 -->
<select id="selectAllGroups" resultType="com.nanri.aiimage.common.model.entity.ShopManageGroupEntity">
SELECT g.id AS id, g.group_name AS groupName, g.company_id AS companyId
SELECT g.id AS id, g.group_name AS groupName, g.company_id AS companyId, g.platform AS platform
FROM biz_shop_manage_group g
ORDER BY g.id ASC
</select>
@@ -81,7 +84,7 @@
AND COALESCE(g.created_by_id, g.user_id) IS NOT NULL
</select>
<select id="selectLedGroups" resultType="com.nanri.aiimage.common.model.entity.ShopManageGroupEntity">
SELECT g.id AS id, g.group_name AS groupName
SELECT g.id AS id, g.group_name AS groupName, g.platform AS platform
FROM biz_shop_manage_group g
WHERE g.created_by_id = #{operatorId} OR g.user_id = #{operatorId}
ORDER BY g.id ASC
@@ -59,9 +59,15 @@ class MigratedSqlEquivalenceTest {
// 补 g.company_id AS companyId(注解时代原文没有这列)——改动是有意的,按 selectTaskPage/V188
// 同款处理整行摘出、点名 NOT_MIGRATED;新形状由 47fc0e08 那单的守卫钉。该笔走 fast 档发版
// 没点本支,2026-11-17 京东分类管理发版窗 full 闸门抓到补记。
private static final int LEDGER_ROWS = 82;
// 60 → 59:摘出去那行是一条 select。(59 → 58:摘 ShopManageGroupMapper#selectAllGroups 同上。)
private static final int LEDGER_SELECTS = 58;
// 82 → 81:2026-11-17 京东分组作用域平台闸(retainJdPlatformGroups)上线当窗事故——
// selectAllGroups 与 selectLedGroups 都没补 g.platform AS platform 投影,每行 getPlatform()
// 恒 null ⇒ 平台闸把全部分组(含刚建的 jd 档)判成非 jd 清空(「建组建成功、京东侧永远
// 不显示」)。selectLedGroups 同批补列,按同款先例整行摘账本点名 NOT_MIGRATED;新形状由
// ShopManageGroupScopeSqlTest 两条投影钉。
private static final int LEDGER_ROWS = 81;
// 60 → 59:摘出去那行是一条 select。(59 → 58:摘 ShopManageGroupMapper#selectAllGroups 同上。
// 58 → 57:摘 ShopManageGroupMapper#selectLedGroups 同上(2026-11-17 platform 补列)。)
private static final int LEDGER_SELECTS = 57;
/** 全部 mapper XML 里的 select 总数:账本 60 + TaskImageCache 5 + AsinResultCache 1。 */
/** 66 → 67:会话容忍新增的 {@code AdminUserMapper#countLiveWorkFor} 也是一条 select。 */
// 67 → 78:keywordshare 模块新写 11 条 select,逐条登记进下方 NOT_MIGRATED。
@@ -206,7 +212,12 @@ class MigratedSqlEquivalenceTest {
// g.company_id AS companyId:注解时代原文没有这列,等价性这支对撞即红。
// 有意改动按先例整行摘账本点名留痕(LEDGER_ROWS 83 → 82 / SELECTS 59 → 58);
// 该笔 fast 档发版漏记,2026-11-17 京东分类管理发版窗 full 闸门抓到补记。
"ShopManageGroupMapper#selectAllGroups");
"ShopManageGroupMapper#selectAllGroups",
// 2026-11-17 京东分组作用域平台闸给 selectLedGroups 补 g.platform AS platform:
// 注解时代原文没有这列(同批 selectAllGroups 也漏了 platform 投影,那已在
// 上面豁免),平台闸读不到平台档把全部组清空。按同款先例整行摘账本点名留痕
// (LEDGER_ROWS 82 → 81 / SELECTS 58 → 57);新形状由 ShopManageGroupScopeSqlTest 钉。
"ShopManageGroupMapper#selectLedGroups");
/** 账本 5 列:接口 / 方法 / @Select 种类 / 是否含常量插值 / 注解原文(Java 反转义后那条串)。 */
private static final int LEDGER_COLUMNS = 5;
@@ -23,7 +23,12 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
* NullPointerException。平台超管是唯一走这条投影的档位,所以只有超管整页炸,非超管一切正常,
* mock 掉 mapper 的单元用例也全都绿。
*
* <p>判据:投影里少了 {@code company_id},本格直接红——那条查询是「组归属公司」的唯一来源。
* <p>2026-11-17 同一条查询再缺一次列:平台闸({@code retainJdPlatformGroups})上线时
* {@code selectAllGroups}/{@code selectLedGroups} 都没补 {@code platform} 投影,每行
* {@code getPlatform()} 都是 {@code null} ⇒ 平台闸把<b>全部分组(含刚建的 jd 档)判成非 jd
* 清空</b>——平台超管在京东侧永远空作用域、空态直建口永远在、建完的组永远不显示
* (「建组建成功、界面永远不显示」的生产实录)。两条投影的判据一并钉进本格:
* 少 {@code company_id} 或少 {@code platform} 都直接红。
*/
class ShopManageGroupScopeSqlTest {
@@ -31,13 +36,25 @@ class ShopManageGroupScopeSqlTest {
private static final String NS = "com.nanri.aiimage.common.mapper.ShopManageGroupMapper";
@Test
void 平台超管的组清单必须投影归属公司() throws Exception {
void 平台超管的组清单必须投影归属公司与平台档() throws Exception {
String sql = render("selectAllGroups");
assertEquals("SELECT g.id AS id, g.group_name AS groupName, g.company_id AS companyId"
+ " FROM biz_shop_manage_group g ORDER BY g.id ASC", sql,
"投影变了:少了 company_id 就是 2026-11-16 那次线上 500(公司名映射为空、"
+ "组标签前缀失效);多了列则要把 assemble 的跨公司前缀判据一起复核");
assertEquals("SELECT g.id AS id, g.group_name AS groupName, g.company_id AS companyId,"
+ " g.platform AS platform FROM biz_shop_manage_group g ORDER BY g.id ASC", sql,
"投影变了:少 company_id 就是 2026-11-16 那次线上 500(公司名映射为空、"
+ "组标签前缀失效);少 platform 就是 2026-11-17 那次平台闸清空全部分组"
+ "(jd 档组建了也不显示);多了列则要把 assemble 的跨公司前缀判据一起复核");
}
@Test
void 管理员档的组清单必须投影平台档() throws Exception {
String sql = render("selectLedGroups");
assertEquals("SELECT g.id AS id, g.group_name AS groupName, g.platform AS platform"
+ " FROM biz_shop_manage_group g WHERE g.created_by_id = ? OR g.user_id = ?"
+ " ORDER BY g.id ASC", sql,
"组长/普通号档走这条投影过平台闸:少 platform 则 jd 档组对非超管永远不可见"
+ "(与 selectAllGroups 同一批病灶,2026-11-17 实录)");
}
private static String render(String id) throws Exception {
@@ -44,7 +44,6 @@ ShopManageGroupMapper selectAccessibleCreatorUserIds Select PURE SELECT DISTINCT
ShopManageGroupMapper selectAccessibleGroupIds Select PURE SELECT DISTINCT accessible_group_id\nFROM (\n SELECT g.id AS accessible_group_id\n FROM biz_shop_manage_group g\n WHERE g.created_by_id = #{operatorId}\n OR g.user_id = #{operatorId}\n UNION\n SELECT gm.group_id AS accessible_group_id\n FROM biz_shop_manage_group_member gm\n WHERE gm.user_id = #{operatorId}\n UNION\n SELECT g2.id AS accessible_group_id\n FROM biz_shop_manage_group_member gm\n INNER JOIN biz_shop_manage_group g1 ON g1.id = gm.group_id\n INNER JOIN biz_shop_manage_group g2\n ON g2.created_by_id = COALESCE(g1.created_by_id, g1.user_id)\n OR g2.user_id = COALESCE(g1.created_by_id, g1.user_id)\n WHERE gm.user_id = #{operatorId}\n AND COALESCE(g1.created_by_id, g1.user_id) IS NOT NULL\n UNION\n SELECT member_groups.id AS accessible_group_id\n FROM biz_shop_manage_group leader_group\n INNER JOIN biz_shop_manage_group_member direct_member ON direct_member.group_id = leader_group.id\n INNER JOIN biz_shop_manage_group member_groups\n ON member_groups.created_by_id = direct_member.user_id\n OR member_groups.user_id = direct_member.user_id\n WHERE leader_group.created_by_id = #{operatorId}\n OR leader_group.user_id = #{operatorId}\n) accessible_groups\nWHERE accessible_group_id IS NOT NULL\nORDER BY accessible_group_id ASC
ShopManageGroupMapper selectGroupNamesByUserIds Select PURE <script>\nSELECT u.id AS userId, g.group_name AS groupName\nFROM users u\nINNER JOIN biz_shop_manage_group g\n ON g.created_by_id = u.created_by_id OR g.user_id = u.created_by_id\nWHERE u.created_by_id IS NOT NULL\n AND u.id IN\n<foreach collection='userIds' item='userId' open='(' separator=',' close=')'>\n #{userId}\n</foreach>\nORDER BY g.id ASC\n</script>
ShopManageGroupMapper selectLeaderIdsByMemberUserId Select PURE SELECT DISTINCT COALESCE(g.created_by_id, g.user_id) AS leader_id\nFROM biz_shop_manage_group_member gm\nINNER JOIN biz_shop_manage_group g ON g.id = gm.group_id\nWHERE gm.user_id = #{userId}\n AND COALESCE(g.created_by_id, g.user_id) IS NOT NULL
ShopManageGroupMapper selectLedGroups Select PURE SELECT g.id AS id, g.group_name AS groupName\nFROM biz_shop_manage_group g\nWHERE g.created_by_id = #{operatorId} OR g.user_id = #{operatorId}\nORDER BY g.id ASC
ShopManageGroupMapper selectManagedMemberUserIds Select PURE SELECT DISTINCT gm.user_id\nFROM biz_shop_manage_group g\nINNER JOIN biz_shop_manage_group_member gm ON gm.group_id = g.id\nINNER JOIN users u ON u.id = gm.user_id\nWHERE g.created_by_id = #{operatorId}\n OR g.user_id = #{operatorId}\nORDER BY gm.user_id ASC
ShopManageGroupMapper selectUserIdsByGroupId Select PURE SELECT u.id AS userId\nFROM users u\nINNER JOIN biz_shop_manage_group g ON g.id = #{groupId}\nWHERE u.id = COALESCE(g.created_by_id, g.user_id)\n OR u.created_by_id = COALESCE(g.created_by_id, g.user_id)\nORDER BY u.id ASC
ShopManageGroupMapper selectUserIdsByGroupIds Select PURE <script>\nSELECT DISTINCT visible_user_id\nFROM (\n SELECT COALESCE(g.created_by_id, g.user_id) AS visible_user_id\n FROM biz_shop_manage_group g\n WHERE g.id IN\n <foreach collection='groupIds' item='groupId' open='(' separator=',' close=')'>\n #{groupId}\n </foreach>\n UNION\n SELECT gm.user_id AS visible_user_id\n FROM biz_shop_manage_group_member gm\n WHERE gm.group_id IN\n <foreach collection='groupIds' item='groupId' open='(' separator=',' close=')'>\n #{groupId}\n </foreach>\n) visible_users\nWHERE visible_user_id IS NOT NULL\nORDER BY visible_user_id ASC\n</script>
Can't render this file because it contains an unexpected character in line 1 and column 222.