From 9f812ded9a0f3b20bb78491810e88be9a0da7ec1 Mon Sep 17 00:00:00 2001 From: qxo <49526356@qq.com> Date: Fri, 10 Nov 2023 11:02:10 +0800 Subject: [PATCH] =?UTF-8?q?fixup!=20refactor:=20=20=E5=A2=9E=E5=8A=A0SQL?= =?UTF-8?q?=E8=A7=A3=E6=9E=90=E7=BC=93=E5=AD=98=EF=BC=8C=E4=BB=A5=E6=8F=90?= =?UTF-8?q?=E5=8D=87=E6=80=A7=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pagehelper/dialect/AbstractHelperDialect.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/github/pagehelper/dialect/AbstractHelperDialect.java b/src/main/java/com/github/pagehelper/dialect/AbstractHelperDialect.java index c333e978..34f56ac0 100644 --- a/src/main/java/com/github/pagehelper/dialect/AbstractHelperDialect.java +++ b/src/main/java/com/github/pagehelper/dialect/AbstractHelperDialect.java @@ -244,13 +244,14 @@ public String getPageSql(MappedStatement ms, BoundSql boundSql, Object parameter } } pageKey.update(orderBy); - sql = cacheOn ? CACHE_PAGESQL.get(cacheSqlKey) : null; - if (sql == null) { - sql = OrderByParser.converToOrderBySql(sql, orderBy, jSqlParser); + String cachedSql = cacheOn ? CACHE_PAGESQL.get(cacheSqlKey) : null; + if (cachedSql == null) { + cachedSql = OrderByParser.converToOrderBySql(sql, orderBy, jSqlParser); if (cacheOn && orderByOnly) { - CACHE_PAGESQL.put(cacheSqlKey, sql); + CACHE_PAGESQL.put(cacheSqlKey, cachedSql); } } + sql = cachedSql; } if (orderByOnly) { return sql; @@ -265,7 +266,7 @@ public String getPageSql(MappedStatement ms, BoundSql boundSql, Object parameter return pageSql; } - protected String getPageCacheSqlKey(Page page, String sql) { + protected String getPageCacheSqlKey(final Page page, final String sql) { if (page.getStartRow() == 0) { return sql; }