From abc32af6e995a9026c3a8b8658f2d916753ceff0 Mon Sep 17 00:00:00 2001 From: zhengwr Date: Wed, 17 Jun 2026 16:32:23 +0800 Subject: [PATCH] =?UTF-8?q?fix(flow):=20=5FSEARCH=20=E8=A7=A3=E6=9E=90?= =?UTF-8?q?=E6=94=B9=20real-first=EF=BC=8C=E5=BF=A0=E5=AE=9E=E6=97=A7?= =?UTF-8?q?=E5=BC=95=E6=93=8E=E4=B8=8D=E5=86=8D=E6=97=A0=E8=84=91=E5=90=88?= =?UTF-8?q?=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 旧引擎 FlowServiceImpl.getFlowDefinition 只按 id 从 sys_serviceflow 读 存储流,无运行时合成(默认流在建实体时 addDefaultFlowService 已落库)。 原 EIP4 对所有 _SEARCH 一律合成默认流,盖住了 605 个真实定制流——致约 107 个列表打不开(合成默认流 order by CREATETIME,但表无 createtime 列) + 约 157 个排序错(真实流 start 脚本里的自定义排序/join/过滤被无视, 如登录历史 order by LOGINTIME DESC)。 改为 real-first:有真实 serviceflow 就优先真实流(NAMED_READ/WRITE, 跑其存储定义的正确语义),仅未迁默认流的实体才合成兜底。这样所有操作 (_ADD/_UPDATE/_LOAD/_SUBMIT 本就 real-first)统一为「读存储流」,与旧 系统一致。real-first 不会比旧系统更错——跑的就是旧系统跑的同一存储流; 真报错旧系统亦然(数据权限校验 / 缺表)。 A/B 验证(650 个 _SEARCH 引用):基线 OK=564 ERR=86 → real-first OK=594 ERR=56,新修 33(含 SYS_USERLOGIN_HISTORY_SEARCH),3 个「回归」 经核为忠实暴露(2 个真实流的员工档案数据权限校验、1 个真实流引用缺表 PM_PROJECTNODEDATA),非 EIP4 执行 bug。 FlowNameResolverTest +1(searchSuffixWithRealFlow_prefersNamedRead)。 Co-Authored-By: Claude Opus 4.8 (1M context) --- .../metadata/flow/FlowNameResolver.java | Bin 12318 -> 13227 bytes .../metadata/flow/FlowNameResolverTest.java | 12 ++++++++++++ 2 files changed, 12 insertions(+) diff --git a/platform-metadata/src/main/java/com/eip4/platform/metadata/flow/FlowNameResolver.java b/platform-metadata/src/main/java/com/eip4/platform/metadata/flow/FlowNameResolver.java index 5959c98556047dacbc27a2a112695c6ec0e54e16..636150ac5bfe00ea101e1d4ad5cec3d461d73b7f 100644 GIT binary patch delta 880 zcmZ8fOHUI~6y9s%!o&!;xoe3IL=YE*1f@n6Y62!MkYIs?a*5jTuzPP63I3dKR7tk03ynx7gGx(=s991(~RDeK9S z7N^Q4Ah4XmnhI#MC;6so z^q)$E{rO!}kK>SFMN>6t?aW{Yr17ltsiSM4$I;ovyzJ?I;Q+<7@Cky zh@7FyiIoVF>{n}DA@hq^U0~jfb8dzjGep}2QBZbSRBY{n%MUpSL{3v9Q1cD#Y|~Io z#IPL<4#`+u0)wWZobhuwcT7YcOre2ZM`zEYC&)bF@yVwW^ zHe`D(MVI^NOd2Z*^H{X6=*A8d(Cz7ddm{ff43vaTJwb9&STSo)v$Rz|N$x|BQ$7m+ zrI;Y>N)-8B63^8Ns+ZX~o=Tl>Q4+k7k6X~BhB4J|R`3uU!BB}%AhTie#eg+{xJogl zv=Of%$u&7sA&_B8mFfKOUGzpt&}+06LvsM3%N~ lX<2%Zw=$V~B)bKKIJ=31#`$YYQw#Kzp5MB;_pssDjlZh+@p1qF delta 90 zcmV-g0Hyz{XP#iNQy3fQzmVvmjOLfN<&cQxh>-8Ri0H4o=Cy(Eyor-r8@-dj9Ke&1 w9T+8#ujqrl=9sVLk-g=Rjpm$<<%*#oQ%_ArR7goqM_*G#K~h6Vv$Y-e6?L95VgLXD diff --git a/platform-metadata/src/test/java/com/eip4/platform/metadata/flow/FlowNameResolverTest.java b/platform-metadata/src/test/java/com/eip4/platform/metadata/flow/FlowNameResolverTest.java index f8a87e6..3f1b8bc 100644 --- a/platform-metadata/src/test/java/com/eip4/platform/metadata/flow/FlowNameResolverTest.java +++ b/platform-metadata/src/test/java/com/eip4/platform/metadata/flow/FlowNameResolverTest.java @@ -83,6 +83,18 @@ class FlowNameResolverTest { assertEquals("VIEW_JGGL_SEARCH", r.definition().getKey()); } + @Test + @DisplayName("_SEARCH 有真实 serviceflow → real-first 优先真实流(NAMED_READ),不合成") + void searchSuffixWithRealFlow_prefersNamedRead() { + // real-first(忠实旧引擎):有真实定制流(自定义排序/join,如登录历史 order by LOGINTIME)就用真实流, + // 不走合成默认流(避免合成的 order by CREATETIME 盖住真实排序 / 无 createtime 列报错)。 + when(jdbc.queryForObject(contains("sys_serviceflow"), eq(Integer.class), + eq("SYS_USERLOGIN_HISTORY_SEARCH"))) + .thenReturn(1); + ResolvedFlow r = resolver.resolve("SYS_USERLOGIN_HISTORY_SEARCH"); + assertEquals(ResolveType.NAMED_READ, r.type(), "有真实流应优先真实流,不合成"); + } + @Test @DisplayName("_SEARCH 后缀但实体不存在 → 走第3级(命名查询),不命中 → ORPHAN") void searchSuffixEntityNotFound_fallsToOrphan() {