From f77704aad7b560050af9ded448e79211f89d2636 Mon Sep 17 00:00:00 2001
From: qhl <quhailong1995@163.com>
Date: Wed, 3 Jan 2024 14:16:16 +0800
Subject: [PATCH] fix: #793

---
 .../com/github/pagehelper/page/PageAutoDialect.java   | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/github/pagehelper/page/PageAutoDialect.java b/src/main/java/com/github/pagehelper/page/PageAutoDialect.java
index 1550b12e..dab66e0f 100644
--- 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);
             }
         }
     }