From 260cf014dcefd5cb8da66fa22e727c7f6eaf4ada Mon Sep 17 00:00:00 2001 From: iqudoo Date: Tue, 31 Mar 2026 16:08:39 +0800 Subject: [PATCH] FIX --- ...-mybatis-generator-plugin-1.0-SNAPSHOT.jar | Bin 30934 -> 31396 bytes .../abstracts/AbstractWithLimitPlugin.java | 7 ++++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/releases/tape-mybatis-generator-plugin-1.0-SNAPSHOT.jar b/releases/tape-mybatis-generator-plugin-1.0-SNAPSHOT.jar index 5f8a5c381f9a9ecaf3fd52ba4d13fd719a3a6972..f7aabf6aba95017efe23ef20a01b21b37694816b 100644 GIT binary patch delta 5264 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 diff --git a/src/main/java/com/iqudoo/framework/mybatis/abstracts/AbstractWithLimitPlugin.java b/src/main/java/com/iqudoo/framework/mybatis/abstracts/AbstractWithLimitPlugin.java index 18fd4ce..6316a14 100644 --- a/src/main/java/com/iqudoo/framework/mybatis/abstracts/AbstractWithLimitPlugin.java +++ b/src/main/java/com/iqudoo/framework/mybatis/abstracts/AbstractWithLimitPlugin.java @@ -81,7 +81,7 @@ public abstract class AbstractWithLimitPlugin extends PluginAdapter implements I "offset", JavaVisibility.PROTECTED, integerWrapper, - null + "null" ); topLevelClass.addField(offsetField); @@ -89,7 +89,7 @@ public abstract class AbstractWithLimitPlugin extends PluginAdapter implements I "rows", JavaVisibility.PROTECTED, integerWrapper, - null + "null" ); topLevelClass.addField(rowsField); @@ -139,6 +139,7 @@ public abstract class AbstractWithLimitPlugin extends PluginAdapter implements I ); setLimit = ElementTools.generateMethodBody( setLimit, + "this.offset = null;", "this.rows = rows;", "return this;" ); @@ -205,7 +206,7 @@ public abstract class AbstractWithLimitPlugin extends PluginAdapter implements I getPageSize = ElementTools.generateMethodBody( getPageSize, "if (this.rows == null) {", - "return 0;", + "return this.ignorePageSize;", "}", "return this.rows;" );