fix: #793

pagehelper · Jan 3, 2024 · f77704a · f77704a
1 parent 6440439
commit f77704a
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/src/main/java/com/github/pagehelper/page/PageAutoDialect.java b/src/main/java/com/github/pagehelper/page/PageAutoDialect.java
@@ -149,10 +149,11 @@ public static String fromJdbcUrl(String jdbcUrl) {
 
     //获取当前的代理对象
     public AbstractHelperDialect getDelegate() {
-        if (delegate != null) {
+        if (autoDialect) {
+            return dialectThreadLocal.get();
+        } else {
             return delegate;
         }
-        return dialectThreadLocal.get();
     }
 
     //移除代理对象
@@ -229,11 +230,11 @@ public void initDelegateDialect(MappedStatement ms, String dialectClass) {
                 }
             }
             dialectThreadLocal.set(dialect);
-        } else if (delegate == null) {
+        } else {
             if (autoDialect) {
-                this.delegate = autoGetDialect(ms);
-            } else {
                 dialectThreadLocal.set(autoGetDialect(ms));
+            } else if (delegate == null) {
+                delegate = autoGetDialect(ms);
             }
         }
     }