From 54d4b8bf1619dc20a0478b472c10d30e9bcf1d77 Mon Sep 17 00:00:00 2001
From: dataprince <dataprince@163.com>
Date: Mon, 15 Jan 2024 11:10:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E4=BE=9D=E8=B5=96pagehelper?=
 =?UTF-8?q?=EF=BC=9A5.3.3=E2=80=94=E2=80=94>6.1.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                          |  2 +-
 .../common/orm/config/MyBatisFlexConfig.java     | 16 ++++++++++++----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 9a13a86..10e1519 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
         <HikariCP.version>5.0.1</HikariCP.version>
         <bitwalker.version>1.21</bitwalker.version>
         <kaptcha.version>2.3.3</kaptcha.version>
-        <pagehelper.version>5.3.3</pagehelper.version>
+        <pagehelper.version>6.1.0</pagehelper.version>
         <fastjson.version>2.0.43</fastjson.version>
         <oshi.version>6.4.8</oshi.version>
         <commons.collections.version>3.2.2</commons.collections.version>
diff --git a/ruoyi-common/ruoyi-common-orm/src/main/java/com/ruoyi/common/orm/config/MyBatisFlexConfig.java b/ruoyi-common/ruoyi-common-orm/src/main/java/com/ruoyi/common/orm/config/MyBatisFlexConfig.java
index 1fedd5b..d3f33f1 100644
--- a/ruoyi-common/ruoyi-common-orm/src/main/java/com/ruoyi/common/orm/config/MyBatisFlexConfig.java
+++ b/ruoyi-common/ruoyi-common-orm/src/main/java/com/ruoyi/common/orm/config/MyBatisFlexConfig.java
@@ -6,18 +6,20 @@ import com.mybatisflex.core.audit.ConsoleMessageCollector;
 import com.mybatisflex.core.audit.MessageCollector;
 import com.mybatisflex.core.datasource.DataSourceDecipher;
 import com.mybatisflex.core.mybatis.FlexConfiguration;
+import com.mybatisflex.core.query.QueryColumnBehavior;
 import com.mybatisflex.spring.boot.ConfigurationCustomizer;
 import com.mybatisflex.spring.boot.MyBatisFlexCustomizer;
 import com.ruoyi.common.orm.core.domain.BaseEntity;
 import com.ruoyi.common.orm.decipher.Decipher;
 import com.ruoyi.common.orm.listener.EntityInsertListener;
 import com.ruoyi.common.orm.listener.EntityUpdateListener;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.ibatis.logging.stdout.StdOutImpl;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 
 /**
@@ -25,17 +27,23 @@ import org.springframework.beans.factory.annotation.Value;
  *
  * @author dataprince数据小王子
  */
+@EnableTransactionManagement(proxyTargetClass = true)
+@AutoConfiguration
+@Slf4j
 @Configuration
 public class MyBatisFlexConfig implements ConfigurationCustomizer, MyBatisFlexCustomizer {
 
-    private static final Logger logger = LoggerFactory.getLogger("mybatis-flex-sql");
-
     @Value("${mybatis-flex.audit_enable}")
     private Boolean enableAudit = false;
 
     @Value("${mybatis-flex.sql_print}")
     private Boolean sqlPrint = false;
 
+    static {
+        QueryColumnBehavior.setIgnoreFunction(QueryColumnBehavior.IGNORE_BLANK);
+        QueryColumnBehavior.setSmartConvertInToEquals(true);
+    }
+
     /**
      * 数据源解密
      */