fix: #793

pagehelper · Jan 3, 2024 · 4e2c012 · 4e2c012
1 parent 6440439
commit 4e2c012
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 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);
             }
         }
     }

diff --git a/src/test/java/com/github/pagehelper/test/features/dialectclass/UsingDialectClassTest.java b/src/test/java/com/github/pagehelper/test/features/dialectclass/UsingDialectClassTest.java
@@ -81,7 +81,7 @@ public void test() {
             PageHelper.startPage(1, 10).using("test1");
             list = userMapper.selectAll();
             page = new PageInfo<User>(list);
-            assertEquals(183, list.size());
+            assertEquals(10, list.size());
             assertEquals(183, page.getTotal());
 
             serializable = PageSerializable.of(list);
@@ -114,7 +114,7 @@ public void test() {
             list = userMapper.selectAll();
             page = new PageInfo<User>(list);
 
-            assertEquals(100, list.size());
+            assertEquals(10, list.size());
             assertEquals(183, page.getTotal());