From 39748c770c83ff1b1e4593c5f24b147361e587c0 Mon Sep 17 00:00:00 2001
From: zhanglin8526 <852614290@qq.com>
Date: 星期三, 10 五月 2023 11:16:49 +0800
Subject: [PATCH] Merge branch 'master' of http://sinata.cn:10101/gitblit/r/java/HongRuiTang

---
 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/config/MyBatisPlusConfig.java |   14 ++++++--------
 1 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/config/MyBatisPlusConfig.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/config/MyBatisPlusConfig.java
index aba8c64..2d53a84 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/config/MyBatisPlusConfig.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/config/MyBatisPlusConfig.java
@@ -1,8 +1,7 @@
 package com.ruoyi.system.config;
 
-import com.baomidou.mybatisplus.annotation.DbType;
-import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
-import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
@@ -21,10 +20,9 @@
      * MyBatisPlus拦截器(用于分页)
      */
     @Bean
-    public MybatisPlusInterceptor paginationInterceptor() {
-        MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
-        //添加MySQL的分页拦截器
-        interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL));
-        return interceptor;
+    @ConditionalOnMissingBean
+    public PaginationInterceptor paginationInterceptor() {
+        PaginationInterceptor paginationInterceptor = new PaginationInterceptor();
+        return paginationInterceptor;
     }
 }
\ No newline at end of file

--
Gitblit v1.7.1