From 69830f1a3b084ad6800c8013268624a11d7fa5f3 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Thu, 11 Jan 2024 09:56:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cms' into anentang
---
src/main/java/com/xcong/farmer/cms/core/handler/PageDataParserHandler.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 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..09b2ab5 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,13 +33,19 @@
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();
@@ -71,7 +77,7 @@
for (int i = startAndEnd[0]; i <= startAndEnd[1]; i++) {
PageChildData child = new PageChildData();
child.setIndex(i);
- if (pageNo == 1) {
+ if (i == 1) {
child.setPath(path + "/index.html");
} else {
child.setPath(path + "/" + StrUtil.format(filename, i));
--
Gitblit v1.9.1