From fbb90c31d56348ec3fcc49af49c66b19992f58df Mon Sep 17 00:00:00 2001 From: zhanghl <253316343@qq.com> Date: 星期五, 16 五月 2025 17:15:32 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev --- aps-common/aps-common-core/src/main/java/com/aps/common/core/config/MyBatisPlusConfig.java | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/aps-common/aps-common-core/src/main/java/com/aps/common/core/config/MyBatisPlusConfig.java b/aps-common/aps-common-core/src/main/java/com/aps/common/core/config/MyBatisPlusConfig.java index 282d753..7f948d1 100644 --- a/aps-common/aps-common-core/src/main/java/com/aps/common/core/config/MyBatisPlusConfig.java +++ b/aps-common/aps-common-core/src/main/java/com/aps/common/core/config/MyBatisPlusConfig.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.annotation.DbType; +import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; import com.baomidou.mybatisplus.extension.plugins.inner.BlockAttackInnerInterceptor; import com.baomidou.mybatisplus.extension.plugins.inner.OptimisticLockerInnerInterceptor; import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; @@ -15,14 +16,16 @@ * 鍒嗛〉鎻掍欢 */ @Bean - public PaginationInnerInterceptor paginationInterceptor() { + public MybatisPlusInterceptor mybatisPlusInterceptor() { + MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor(); PaginationInnerInterceptor paginationInterceptor = new PaginationInnerInterceptor(); // 璁剧疆璇锋眰鐨勯〉闈㈠ぇ浜庢渶澶ч〉鍚庢槸鍚﹁繘琛屽洖婊�, true鍥炴粴, false缁х画 paginationInterceptor.setOverflow(false); // 璁剧疆鏈�澶у崟椤甸檺鍒舵暟閲�, 榛樿 500 鏉�, -1 涓嶅彈闄愬埗 - paginationInterceptor.setDbType(DbType.MYSQL); + paginationInterceptor.setDbType(DbType.POSTGRE_SQL); paginationInterceptor.setMaxLimit(-1L); - return paginationInterceptor; + interceptor.addInnerInterceptor(paginationInterceptor); + return interceptor; } /** -- Gitblit v1.9.3