From 6a07f220e8f855740eee9b9dcae75464d6266380 Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Thu, 20 Oct 2022 22:53:10 +0800
Subject: [PATCH] 修复分页死循环

---
 src/main/java/com/xcong/farmer/cms/core/handler/PageDataParserHandler.java |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/xcong/farmer/cms/core/handler/PageDataParserHandler.java b/src/main/java/com/xcong/farmer/cms/core/handler/PageDataParserHandler.java
index ea4235c..a29599f 100644
--- a/src/main/java/com/xcong/farmer/cms/core/handler/PageDataParserHandler.java
+++ b/src/main/java/com/xcong/farmer/cms/core/handler/PageDataParserHandler.java
@@ -33,14 +33,20 @@
     private ColumnMapper columnMapper = SpringContextHolder.getBean(ColumnMapper.class);
     @Override
     public void dataParser(AttrNode attrNode) {
-//        log.info("分页解析");
+        log.info("分页解析");
         synchronized (this) {
             Template.HAS_PAGING = true;
+
             String baseUrl = (String) attrNode.getSystemDataValue("baseUrl");
 
             Long companyId = (Long) attrNode.getSystemDataValue("companyId");
             Pagination param = (Pagination) attrNode.getParam();
 
+            Object pageNum = attrNode.getSystemDataValue("page");
+            if (pageNum != null) {
+                param.setPage(pageNum.toString());
+            }
+
             Page<ArticleEntity> page = new Page<>(Integer.parseInt(param.getPage()), Integer.parseInt(param.getLimit()));
             ArticleEntity article = new ArticleEntity();
             article.setColumnCode(param.getCode());

--
Gitblit v1.9.1