From e7564cd3217f6183232aff79aa97bbac74c51f80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E5=AE=87=E5=A5=87?= <liangyuqi@bdfint.com>
Date: Sun, 30 Mar 2025 15:43:14 +0800
Subject: [PATCH] =?UTF-8?q?fix:mybatis-plus=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                             |  8 +++++---
 ruoyi-common/pom.xml                                | 12 ++++++++++++
 .../ruoyi/framework/config/MybatisPlusConfig.java   | 13 +++++++------
 3 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/pom.xml b/pom.xml
index a1b02fd23..76fbcb44a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,14 +23,14 @@
         <bitwalker.version>1.21</bitwalker.version>
         <swagger.version>3.0.0</swagger.version>
         <kaptcha.version>2.3.3</kaptcha.version>
-        <pagehelper.boot.version>1.4.7</pagehelper.boot.version>
+        <pagehelper.boot.version>2.1.0</pagehelper.boot.version>
         <fastjson.version>2.0.53</fastjson.version>
         <oshi.version>6.6.5</oshi.version>
         <commons.io.version>2.13.0</commons.io.version>
         <poi.version>4.1.2</poi.version>
         <velocity.version>2.3</velocity.version>
         <jwt.version>0.9.1</jwt.version>
-        <mybatisplus.version>3.5.10.1</mybatisplus.version>
+        <mybatisplus.version>3.5.11</mybatisplus.version>
         <hutool.version>5.8.36</hutool.version>
         <elasticsearch.version>8.17.4</elasticsearch.version>
         <jakarta.json-api.version>2.1.1</jakarta.json-api.version>
@@ -116,8 +116,10 @@
             <!-- mybatisplus -->
             <dependency>
                 <groupId>com.baomidou</groupId>
-                <artifactId>mybatis-plus-boot-starter</artifactId>
+                <artifactId>mybatis-plus-bom</artifactId>
                 <version>${mybatisplus.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
             </dependency>
 
             <!-- 解析客户端操作系统、浏览器等 -->
diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml
index 79bd346a9..c16f25ad3 100644
--- a/ruoyi-common/pom.xml
+++ b/ruoyi-common/pom.xml
@@ -37,6 +37,18 @@
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-boot-starter</artifactId>
         </dependency>
+        <!-- jdk 8+ 引入可选模块 -->
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-jsqlparser-4.9</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.github.jsqlparser</groupId>
+                    <artifactId>jsqlparser</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
 
         <!-- Spring框架基本的核心工具 -->
         <dependency>
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MybatisPlusConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MybatisPlusConfig.java
index 8695fbf99..4bea411d3 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MybatisPlusConfig.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MybatisPlusConfig.java
@@ -2,6 +2,8 @@ package com.ruoyi.framework.config;
 
 import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.inner.OptimisticLockerInnerInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
@@ -9,20 +11,19 @@ import org.springframework.context.annotation.Configuration;
  * @author liangyq
  * @date 2025-03-18 15:16
  */
+@Slf4j
 @Configuration
 public class MybatisPlusConfig {
 
-    /**
-     * 乐观锁{@link com.baomidou.mybatisplus.annotation.Version}
-     *
-     * @return
-     */
+
     @Bean
     public MybatisPlusInterceptor mybatisPlusInterceptor() {
         MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
+        //乐观锁
         interceptor.addInnerInterceptor(new OptimisticLockerInnerInterceptor());
+        //分页最后添加
+        interceptor.addInnerInterceptor(new PaginationInnerInterceptor());
         return interceptor;
     }
 
-
 }