From c4017cc96486058f4133ef11df3217b05df4708c Mon Sep 17 00:00:00 2001 From: cat-shark <1716967236@qq.com> Date: Thu, 22 Oct 2026 21:59:03 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=88=86=E9=A1=B5=E6=8B=A6=E6=88=AA?= =?UTF-8?q?=E5=99=A8=E6=94=B9=E5=88=B0=E7=A7=9F=E6=88=B7=E6=8B=A6=E6=88=AA?= =?UTF-8?q?=E5=99=A8=E4=B9=8B=E5=90=8E=E6=B3=A8=E5=86=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config/MybatisPlusConfig.java | 8 ++++++-- .../config/MybatisPlusConfigTest.java | 10 ++++++---- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/guo/learningprogresstracker/config/MybatisPlusConfig.java b/src/main/java/com/guo/learningprogresstracker/config/MybatisPlusConfig.java index f8d8301..342c8bb 100644 --- a/src/main/java/com/guo/learningprogresstracker/config/MybatisPlusConfig.java +++ b/src/main/java/com/guo/learningprogresstracker/config/MybatisPlusConfig.java @@ -40,8 +40,10 @@ public class MybatisPlusConfig { @Bean public MybatisPlusInterceptor mybatisPlusInterceptor() { MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor(); - // 分页拦截器必须注册,否则 selectPage 不会生成 LIMIT / COUNT - interceptor.addInnerInterceptor(new PaginationInnerInterceptor()); + // 顺序很重要:MyBatis-Plus 要求「多租户 → 分页」。 + // 分页的 count 语句是从「当前已处理的 SQL」派生的;若分页先注册, + // count 会在租户条件追加之前就派生出来,导致 total 把其他用户的行也算进去 + // (records 仍然正确,只有分页总数跨租户,极难发现)。 interceptor.addInnerInterceptor(new TenantLineInnerInterceptor(new TenantLineHandler() { @Override public Expression getTenantId() { @@ -61,6 +63,8 @@ public class MybatisPlusConfig { return EXCLUDE_TABLES.contains(tableName.toLowerCase()); } })); + // 分页拦截器必须注册,否则 selectPage 不会生成 LIMIT / COUNT + interceptor.addInnerInterceptor(new PaginationInnerInterceptor()); return interceptor; } } diff --git a/src/test/java/com/guo/learningprogresstracker/config/MybatisPlusConfigTest.java b/src/test/java/com/guo/learningprogresstracker/config/MybatisPlusConfigTest.java index 81d591c..6e93b5f 100644 --- a/src/test/java/com/guo/learningprogresstracker/config/MybatisPlusConfigTest.java +++ b/src/test/java/com/guo/learningprogresstracker/config/MybatisPlusConfigTest.java @@ -54,14 +54,16 @@ class MybatisPlusConfigTest { } @Test - void mybatisPlusInterceptor_registersPaginationAndTenantInterceptors() throws Exception { + void mybatisPlusInterceptor_registersTenantBeforePagination() throws Exception { MybatisPlusInterceptor interceptor = new MybatisPlusConfig().mybatisPlusInterceptor(); List innerInterceptors = interceptor.getInterceptors(); assertEquals(2, innerInterceptors.size()); - assertInstanceOf(PaginationInnerInterceptor.class, innerInterceptors.get(0)); + // 顺序不能反:分页的 count 语句是从「当前已处理的 SQL」派生的, + // 租户必须先生效,否则 count 不带 created_by,total 会跨租户 TenantLineInnerInterceptor tenantInterceptor = - assertInstanceOf(TenantLineInnerInterceptor.class, innerInterceptors.get(1)); + assertInstanceOf(TenantLineInnerInterceptor.class, innerInterceptors.get(0)); + assertInstanceOf(PaginationInnerInterceptor.class, innerInterceptors.get(1)); TenantLineHandler handler = tenantLineHandler(tenantInterceptor); assertEquals("created_by", handler.getTenantIdColumn()); @@ -105,7 +107,7 @@ class MybatisPlusConfigTest { } private TenantLineInnerInterceptor tenantInterceptorOf(MybatisPlusConfig config) { - return (TenantLineInnerInterceptor) config.mybatisPlusInterceptor().getInterceptors().get(1); + return (TenantLineInnerInterceptor) config.mybatisPlusInterceptor().getInterceptors().get(0); } /** TenantLineInnerInterceptor 未暴露 handler 访问器,通过反射读取私有字段。 */