fix: 分页拦截器改到租户拦截器之后注册
This commit is contained in:
@@ -40,8 +40,10 @@ public class MybatisPlusConfig {
|
|||||||
@Bean
|
@Bean
|
||||||
public MybatisPlusInterceptor mybatisPlusInterceptor() {
|
public MybatisPlusInterceptor mybatisPlusInterceptor() {
|
||||||
MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
|
MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
|
||||||
// 分页拦截器必须注册,否则 selectPage 不会生成 LIMIT / COUNT
|
// 顺序很重要:MyBatis-Plus 要求「多租户 → 分页」。
|
||||||
interceptor.addInnerInterceptor(new PaginationInnerInterceptor());
|
// 分页的 count 语句是从「当前已处理的 SQL」派生的;若分页先注册,
|
||||||
|
// count 会在租户条件追加之前就派生出来,导致 total 把其他用户的行也算进去
|
||||||
|
// (records 仍然正确,只有分页总数跨租户,极难发现)。
|
||||||
interceptor.addInnerInterceptor(new TenantLineInnerInterceptor(new TenantLineHandler() {
|
interceptor.addInnerInterceptor(new TenantLineInnerInterceptor(new TenantLineHandler() {
|
||||||
@Override
|
@Override
|
||||||
public Expression getTenantId() {
|
public Expression getTenantId() {
|
||||||
@@ -61,6 +63,8 @@ public class MybatisPlusConfig {
|
|||||||
return EXCLUDE_TABLES.contains(tableName.toLowerCase());
|
return EXCLUDE_TABLES.contains(tableName.toLowerCase());
|
||||||
}
|
}
|
||||||
}));
|
}));
|
||||||
|
// 分页拦截器必须注册,否则 selectPage 不会生成 LIMIT / COUNT
|
||||||
|
interceptor.addInnerInterceptor(new PaginationInnerInterceptor());
|
||||||
return interceptor;
|
return interceptor;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -54,14 +54,16 @@ class MybatisPlusConfigTest {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
void mybatisPlusInterceptor_registersPaginationAndTenantInterceptors() throws Exception {
|
void mybatisPlusInterceptor_registersTenantBeforePagination() throws Exception {
|
||||||
MybatisPlusInterceptor interceptor = new MybatisPlusConfig().mybatisPlusInterceptor();
|
MybatisPlusInterceptor interceptor = new MybatisPlusConfig().mybatisPlusInterceptor();
|
||||||
|
|
||||||
List<InnerInterceptor> innerInterceptors = interceptor.getInterceptors();
|
List<InnerInterceptor> innerInterceptors = interceptor.getInterceptors();
|
||||||
assertEquals(2, innerInterceptors.size());
|
assertEquals(2, innerInterceptors.size());
|
||||||
assertInstanceOf(PaginationInnerInterceptor.class, innerInterceptors.get(0));
|
// 顺序不能反:分页的 count 语句是从「当前已处理的 SQL」派生的,
|
||||||
|
// 租户必须先生效,否则 count 不带 created_by,total 会跨租户
|
||||||
TenantLineInnerInterceptor tenantInterceptor =
|
TenantLineInnerInterceptor tenantInterceptor =
|
||||||
assertInstanceOf(TenantLineInnerInterceptor.class, innerInterceptors.get(1));
|
assertInstanceOf(TenantLineInnerInterceptor.class, innerInterceptors.get(0));
|
||||||
|
assertInstanceOf(PaginationInnerInterceptor.class, innerInterceptors.get(1));
|
||||||
|
|
||||||
TenantLineHandler handler = tenantLineHandler(tenantInterceptor);
|
TenantLineHandler handler = tenantLineHandler(tenantInterceptor);
|
||||||
assertEquals("created_by", handler.getTenantIdColumn());
|
assertEquals("created_by", handler.getTenantIdColumn());
|
||||||
@@ -105,7 +107,7 @@ class MybatisPlusConfigTest {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private TenantLineInnerInterceptor tenantInterceptorOf(MybatisPlusConfig config) {
|
private TenantLineInnerInterceptor tenantInterceptorOf(MybatisPlusConfig config) {
|
||||||
return (TenantLineInnerInterceptor) config.mybatisPlusInterceptor().getInterceptors().get(1);
|
return (TenantLineInnerInterceptor) config.mybatisPlusInterceptor().getInterceptors().get(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
/** TenantLineInnerInterceptor 未暴露 handler 访问器,通过反射读取私有字段。 */
|
/** TenantLineInnerInterceptor 未暴露 handler 访问器,通过反射读取私有字段。 */
|
||||||
|
|||||||
Reference in New Issue
Block a user