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/ArticlesDataParserHandler.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/xcong/farmer/cms/core/handler/ArticlesDataParserHandler.java b/src/main/java/com/xcong/farmer/cms/core/handler/ArticlesDataParserHandler.java
index 1c3b8ae..4c7ed9b 100644
--- a/src/main/java/com/xcong/farmer/cms/core/handler/ArticlesDataParserHandler.java
+++ b/src/main/java/com/xcong/farmer/cms/core/handler/ArticlesDataParserHandler.java
@@ -30,12 +30,17 @@
@Override
public void dataParser(AttrNode node) {
- log.info("文章列表解析");
+// log.info("文章列表解析");
Long companyId = (Long) node.getSystemDataValue("companyId");
String companyCode = (String) node.getSystemDataValue("companyCode");
String baseUrl = (String) node.getSystemDataValue("baseUrl");
+ Object pageNo = node.getSystemDataValue("page");
Articles param = (Articles) node.getParam();
+ if (pageNo != null) {
+ param.setPage(pageNo.toString());
+ }
+
ArticleEntity article = new ArticleEntity();
Page<ArticleEntity> page = new Page<>(Integer.parseInt(param.getPage()), Integer.parseInt(param.getLimit()));
if (StrUtil.isEmpty(param.getColId())) {
@@ -50,6 +55,8 @@
article.setColumnIds(colIds);
}
article.setCompanyId(companyId);
+ article.setDelStatus(ArticleEntity.DELETE_STATUS_NO);
+ article.setDraftState(2);
if (StrUtil.isNotBlank(param.getType())) {
if ("hot".equals(param.getType())) {
@@ -61,7 +68,7 @@
List<ArticleData> list = new ArrayList<>();
for (ArticleEntity record : listPage.getRecords()) {
- ArticleData articleData = entityToData(record, baseUrl + companyCode);
+ ArticleData articleData = entityToData(record, baseUrl);
list.add(articleData);
}
--
Gitblit v1.9.1