diff --git a/pom.xml b/pom.xml
index a1b02fd23..76fbcb44a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,14 +23,14 @@
1.21
3.0.0
2.3.3
- 1.4.7
+ 2.1.0
2.0.53
6.6.5
2.13.0
4.1.2
2.3
0.9.1
- 3.5.10.1
+ 3.5.11
5.8.36
8.17.4
2.1.1
@@ -116,8 +116,10 @@
com.baomidou
- mybatis-plus-boot-starter
+ mybatis-plus-bom
${mybatisplus.version}
+ pom
+ import
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 @@
com.baomidou
mybatis-plus-boot-starter
+
+
+ com.baomidou
+ mybatis-plus-jsqlparser-4.9
+
+
+ com.github.jsqlparser
+ jsqlparser
+
+
+
+
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;
}
-
}