From d850c46f46d69ba25c41a94f5dc60db2656dbd4e 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, 17 Nov 2026 21:08:59 +0800 Subject: [PATCH] =?UTF-8?q?fix(jd):=20=E4=BA=AC=E4=B8=9C=E5=88=86=E7=BB=84?= =?UTF-8?q?=E4=BD=9C=E7=94=A8=E5=9F=9F=E4=B8=A4=E6=9D=A1=E5=8F=96=E7=BB=84?= =?UTF-8?q?=20SQL=20=E8=A1=A5=20platform=20=E6=8A=95=E5=BD=B1=E2=80=94?= =?UTF-8?q?=E2=80=94=E5=B9=B3=E5=8F=B0=E9=97=B8=E8=AF=BB=E4=B8=8D=E5=88=B0?= =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E6=A1=A3=E6=8A=8A=E5=85=A8=E9=83=A8=E7=BB=84?= =?UTF-8?q?=EF=BC=88=E5=90=AB=20jd=20=E6=A1=A3=EF=BC=89=E5=88=A4=E9=9D=9E?= =?UTF-8?q?=20jd=20=E6=B8=85=E7=A9=BA=EF=BC=8C=E5=B9=B3=E5=8F=B0=E8=B6=85?= =?UTF-8?q?=E7=AE=A1=E5=BB=BA=E7=BB=84=E5=BB=BA=E6=88=90=E5=8A=9F=E4=BA=AC?= =?UTF-8?q?=E4=B8=9C=E4=BE=A7=E6=B0=B8=E4=B8=8D=E6=98=BE=E7=A4=BA=EF=BC=88?= =?UTF-8?q?2026-11-17=20=E7=94=A8=E6=88=B7=E6=88=AA=E5=9B=BE=E3=80=8C?= =?UTF-8?q?=E5=92=8B=E6=B2=A1=E6=98=BE=E7=A4=BA=E3=80=8D=E5=AE=9E=E5=BD=95?= =?UTF-8?q?=EF=BC=89=E3=80=82selectAllGroups/selectLedGroups=20=E5=90=84?= =?UTF-8?q?=E8=A1=A5=20g.platform=20AS=20platform=EF=BC=88selectAllGroups?= =?UTF-8?q?=20=E4=B8=8A=E6=AC=A1=2047fc0e08=20=E8=A1=A5=20company=5Fid=20?= =?UTF-8?q?=E5=90=8C=E4=B8=80=E6=9D=A1=E6=9F=A5=E8=AF=A2=E5=90=8C=E6=AC=BE?= =?UTF-8?q?=E7=97=85=EF=BC=89=EF=BC=9BselectLedGroups=20=E6=8C=89=E5=85=88?= =?UTF-8?q?=E4=BE=8B=E6=95=B4=E8=A1=8C=E6=91=98=E8=BF=81=E7=A7=BB=E7=AD=89?= =?UTF-8?q?=E4=BB=B7=E8=B4=A6=E6=9C=AC=E7=82=B9=E5=90=8D=20NOT=5FMIGRATED?= =?UTF-8?q?=EF=BC=88LEDGER=5FROWS=2082=E2=86=9281/SELECTS=2058=E2=86=9257?= =?UTF-8?q?=EF=BC=89=EF=BC=9BShopManageGroupScopeSqlTest=20=E5=8D=87?= =?UTF-8?q?=E7=BA=A7=E5=8F=8C=E4=BA=8B=E6=95=85=E7=BB=8A=E7=BA=BF=EF=BC=9A?= =?UTF-8?q?=E8=B6=85=E7=AE=A1=E6=8A=95=E5=BD=B1=E9=92=89=20company=5Fid+pl?= =?UTF-8?q?atform=20=E4=B8=A4=E5=88=97=E3=80=81=E6=96=B0=E5=A2=9E=E7=BB=84?= =?UTF-8?q?=E9=95=BF=E6=A1=A3=E6=8A=95=E5=BD=B1=E6=A0=BC=E3=80=82=E5=88=A4?= =?UTF-8?q?=E6=8D=AE=EF=BC=9A=E6=8A=95=E5=BD=B1=E7=BC=BA=E4=BB=BB=E4=B8=80?= =?UTF-8?q?=E5=88=97=E5=8D=B3=E7=BA=A2=EF=BC=88mock=20=E6=8E=89=20mapper?= =?UTF-8?q?=20=E7=9A=84=E6=9C=8D=E5=8A=A1=E7=94=A8=E4=BE=8B=E7=85=A7?= =?UTF-8?q?=E6=97=A7=E7=BB=BF=E2=80=94=E2=80=94=E8=BF=99=E6=AD=A3=E6=98=AF?= =?UTF-8?q?=E4=B8=A4=E8=BF=9E=E6=BC=8F=E7=9A=84=E6=88=90=E5=9B=A0=EF=BC=89?= =?UTF-8?q?=EF=BC=9Bmvn=20-o=20test=20=E4=B8=89=E7=B1=BB=2022=20=E4=BE=8B?= =?UTF-8?q?=E5=85=A8=E7=BB=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/common/ShopManageGroupMapper.xml | 7 +++-- .../aiimage/MigratedSqlEquivalenceTest.java | 19 +++++++++--- .../mapper/ShopManageGroupScopeSqlTest.java | 29 +++++++++++++++---- .../sql-layering/migrated-statements.tsv | 1 - 4 files changed, 43 insertions(+), 13 deletions(-) diff --git a/backend-java/src/main/resources/mapper/common/ShopManageGroupMapper.xml b/backend-java/src/main/resources/mapper/common/ShopManageGroupMapper.xml index ce8193309..1450d30a7 100644 --- a/backend-java/src/main/resources/mapper/common/ShopManageGroupMapper.xml +++ b/backend-java/src/main/resources/mapper/common/ShopManageGroupMapper.xml @@ -56,8 +56,11 @@ WHERE accessible_group_id IS NOT NULL ORDER BY accessible_group_id ASC + - 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 @@ -81,7 +84,7 @@ AND COALESCE(g.created_by_id, g.user_id) IS NOT NULL - 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 diff --git a/backend-java/src/test/java/com/nanri/aiimage/MigratedSqlEquivalenceTest.java b/backend-java/src/test/java/com/nanri/aiimage/MigratedSqlEquivalenceTest.java index 2169afb09..5a1dcd276 100644 --- a/backend-java/src/test/java/com/nanri/aiimage/MigratedSqlEquivalenceTest.java +++ b/backend-java/src/test/java/com/nanri/aiimage/MigratedSqlEquivalenceTest.java @@ -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; diff --git a/backend-java/src/test/java/com/nanri/aiimage/common/mapper/ShopManageGroupScopeSqlTest.java b/backend-java/src/test/java/com/nanri/aiimage/common/mapper/ShopManageGroupScopeSqlTest.java index c3bd99040..923e93589 100644 --- a/backend-java/src/test/java/com/nanri/aiimage/common/mapper/ShopManageGroupScopeSqlTest.java +++ b/backend-java/src/test/java/com/nanri/aiimage/common/mapper/ShopManageGroupScopeSqlTest.java @@ -23,7 +23,12 @@ import static org.junit.jupiter.api.Assertions.assertEquals; * NullPointerException。平台超管是唯一走这条投影的档位,所以只有超管整页炸,非超管一切正常, * mock 掉 mapper 的单元用例也全都绿。 * - * 判据:投影里少了 {@code company_id},本格直接红——那条查询是「组归属公司」的唯一来源。 + * 2026-11-17 同一条查询再缺一次列:平台闸({@code retainJdPlatformGroups})上线时 + * {@code selectAllGroups}/{@code selectLedGroups} 都没补 {@code platform} 投影,每行 + * {@code getPlatform()} 都是 {@code null} ⇒ 平台闸把全部分组(含刚建的 jd 档)判成非 jd + * 清空——平台超管在京东侧永远空作用域、空态直建口永远在、建完的组永远不显示 + * (「建组建成功、界面永远不显示」的生产实录)。两条投影的判据一并钉进本格: + * 少 {@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 { diff --git a/backend-java/src/test/resources/sql-layering/migrated-statements.tsv b/backend-java/src/test/resources/sql-layering/migrated-statements.tsv index 2432d3f42..259bbd8e9 100644 --- a/backend-java/src/test/resources/sql-layering/migrated-statements.tsv +++ b/backend-java/src/test/resources/sql-layering/migrated-statements.tsv @@ -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 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
判据:投影里少了 {@code company_id},本格直接红——那条查询是「组归属公司」的唯一来源。 + *
2026-11-17 同一条查询再缺一次列:平台闸({@code retainJdPlatformGroups})上线时 + * {@code selectAllGroups}/{@code selectLedGroups} 都没补 {@code platform} 投影,每行 + * {@code getPlatform()} 都是 {@code null} ⇒ 平台闸把全部分组(含刚建的 jd 档)判成非 jd + * 清空——平台超管在京东侧永远空作用域、空态直建口永远在、建完的组永远不显示 + * (「建组建成功、界面永远不显示」的生产实录)。两条投影的判据一并钉进本格: + * 少 {@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 { diff --git a/backend-java/src/test/resources/sql-layering/migrated-statements.tsv b/backend-java/src/test/resources/sql-layering/migrated-statements.tsv index 2432d3f42..259bbd8e9 100644 --- a/backend-java/src/test/resources/sql-layering/migrated-statements.tsv +++ b/backend-java/src/test/resources/sql-layering/migrated-statements.tsv @@ -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 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