From 0f8b37e279109eed2f3a93fbb3e910b1ef87e4d3 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 01:28:46 +0800 Subject: [PATCH] =?UTF-8?q?fix(backend):=20=E8=A1=A5=E8=AE=B0=20selectAllG?= =?UTF-8?q?roups=20=E8=A1=A5=E5=88=97=E8=BF=9B=E8=BF=81=E7=A7=BB=E7=AD=89?= =?UTF-8?q?=E4=BB=B7=E8=B4=A6=E6=9C=AC=E2=80=94=E2=80=9447fc0e08=20?= =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E8=B6=85=E7=AE=A1=20500=20=E7=83=AD=E4=BF=AE?= =?UTF-8?q?=E7=BB=99=20XML=20=E8=A1=A5=20g.company=5Fid=EF=BC=8C=E6=B3=A8?= =?UTF-8?q?=E8=A7=A3=E6=97=B6=E4=BB=A3=E5=8E=9F=E6=96=87=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E8=BF=99=E5=88=97=EF=BC=8Cfast=20=E6=A1=A3=E5=8F=91=E7=89=88?= =?UTF-8?q?=E6=B2=A1=E7=82=B9=E6=9C=AC=E6=94=AF=E6=BC=8F=E8=AE=B0=EF=BC=8C?= =?UTF-8?q?=E6=9C=AC=E7=AA=97=20full=20=E9=97=B8=E9=97=A8=E6=8A=93?= =?UTF-8?q?=E5=88=B0=EF=BC=9B=E6=8C=89=20selectTaskPage/V188=20=E5=85=88?= =?UTF-8?q?=E4=BE=8B=E6=95=B4=E8=A1=8C=E6=91=98=E5=87=BA=E8=B4=A6=E6=9C=AC?= =?UTF-8?q?=E3=80=81=E7=82=B9=E5=90=8D=20NOT=5FMIGRATED=EF=BC=88LEDGER=5FR?= =?UTF-8?q?OWS=2083=E2=86=9282=EF=BC=8FSELECTS=2059=E2=86=9258=EF=BC=89?= =?UTF-8?q?=EF=BC=8C=E5=A4=8D=E8=B7=91=203/3=20=E7=BB=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../aiimage/MigratedSqlEquivalenceTest.java | 17 +++++++++++++---- .../sql-layering/migrated-statements.tsv | 1 - 2 files changed, 13 insertions(+), 5 deletions(-) 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 3e00d8e4d..2169afb09 100644 --- a/backend-java/src/test/java/com/nanri/aiimage/MigratedSqlEquivalenceTest.java +++ b/backend-java/src/test/java/com/nanri/aiimage/MigratedSqlEquivalenceTest.java @@ -55,9 +55,13 @@ class MigratedSqlEquivalenceTest { // 85 → 84:Phase 5(AC-19/P1-B1)有意把 {@code TaskCenterQueryMapper#selectTaskPage} 从 // OFFSET 改成 keyset 游标。账本记的是「注解时代原文」,改一行基准就等于让等价性测试照着 // 新 SQL 自证 ⇒ 把该行整条摘出账本、点名进下方 NOT_MIGRATED,让基准继续只描述真正未改动的迁移件。 - private static final int LEDGER_ROWS = 83; - // 60 → 59:摘出去那行是一条 select。 - private static final int LEDGER_SELECTS = 59; + // 83 → 82:47fc0e08(2026-11-16 平台超管 500 热修)给 ShopManageGroupMapper#selectAllGroups 的 XML + // 补 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; /** 全部 mapper XML 里的 select 总数:账本 60 + TaskImageCache 5 + AsinResultCache 1。 */ /** 66 → 67:会话容忍新增的 {@code AdminUserMapper#countLiveWorkFor} 也是一条 select。 */ // 67 → 78:keywordshare 模块新写 11 条 select,逐条登记进下方 NOT_MIGRATED。 @@ -197,7 +201,12 @@ class MigratedSqlEquivalenceTest { // 配额原语),没有注解原文可对撞,点名留痕。该笔当时只点编译没跑整量、漏记两处 // 账本,2026-11-15 发版前整量抓到补记(XML_SELECT_TOTAL 113 → 114, // SqlLayeringConventionTest.XML_STATEMENT_TOTAL 同轮 163 → 164)。 - "JdProductMapper#countByUserIds"); + "JdProductMapper#countByUserIds", + // 47fc0e08(2026-11-16 平台超管 500 热修)给 selectAllGroups 的 XML 补 + // g.company_id AS companyId:注解时代原文没有这列,等价性这支对撞即红。 + // 有意改动按先例整行摘账本点名留痕(LEDGER_ROWS 83 → 82 / SELECTS 59 → 58); + // 该笔 fast 档发版漏记,2026-11-17 京东分类管理发版窗 full 闸门抓到补记。 + "ShopManageGroupMapper#selectAllGroups"); /** 账本 5 列:接口 / 方法 / @Select 种类 / 是否含常量插值 / 注解原文(Java 反转义后那条串)。 */ private static final int LEDGER_COLUMNS = 5; 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 e8af75bcc..2432d3f42 100644 --- a/backend-java/src/test/resources/sql-layering/migrated-statements.tsv +++ b/backend-java/src/test/resources/sql-layering/migrated-statements.tsv @@ -42,7 +42,6 @@ ShopDuplicateCheckSourceMapper selectManagedShopNames Select PURE SELECT DISTINC ShopDuplicateCheckSourceMapper selectShopNamesOwnedBy Select PURE ShopManageGroupMapper selectAccessibleCreatorUserIds Select PURE SELECT DISTINCT visible_user_id\nFROM (\n SELECT #{operatorId} AS visible_user_id\n UNION\n SELECT direct_member.user_id AS visible_user_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 WHERE leader_group.created_by_id = #{operatorId}\n OR leader_group.user_id = #{operatorId}\n UNION\n SELECT COALESCE(direct_group.created_by_id, direct_group.user_id) AS visible_user_id\n FROM biz_shop_manage_group_member membership\n INNER JOIN biz_shop_manage_group direct_group ON direct_group.id = membership.group_id\n WHERE membership.user_id = #{operatorId}\n AND COALESCE(direct_group.created_by_id, direct_group.user_id) IS NOT NULL\n) visible_users\nWHERE visible_user_id IS NOT NULL\nORDER BY visible_user_id ASC 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 selectAllGroups Select PURE SELECT g.id AS id, g.group_name AS groupName\nFROM biz_shop_manage_group g\nORDER BY g.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