From 249f6a8da667a1cfe019ce9c647492da9562dd1a Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 11 Jul 2022 17:04:07 +0800
Subject: [PATCH] fix
---
src/main/java/com/xcong/farmer/cms/core/handler/ArticlesDataParserHandler.java | 31 +++++++++++++++++++------------
1 files changed, 19 insertions(+), 12 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 2a0f273..63bde5f 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
@@ -34,25 +34,32 @@
log.info("文章列表解析");
Long companyId = (Long) node.getSystemDataValue("companyId");
Articles param = (Articles) node.getParam();
-
+ ArticleEntity article = new ArticleEntity();
+ Page<ArticleEntity> page = new Page<>(Integer.parseInt(param.getPage()), Integer.parseInt(param.getLimit()));
if (StrUtil.isEmpty(param.getColId())) {
- Page<ArticleEntity> page = new Page<>(Integer.parseInt(param.getPage()), Integer.parseInt(param.getLimit()));
- ArticleEntity article = new ArticleEntity();
article.setColumnCode(param.getCode());
- article.setCompanyId(companyId);
- IPage<ArticleEntity> listPage = articleMapper.selectArticleInPage(page, article);
- List<ArticleData> list = new ArrayList<>();
- for (ArticleEntity record : listPage.getRecords()) {
- ArticleData articleData = entityToData(record);
- list.add(articleData);
- }
-
- node.setData(list);
} else {
+ List<String> colIdsStr = StrUtil.split(param.getColId(), ',');
+ List<Long> colIds = new ArrayList<>();
+ colIdsStr.forEach(item -> {
+ colIds.add(Long.parseLong(item));
+ });
+ article.setColumnIds(colIds);
}
+ article.setCompanyId(companyId);
+
+ IPage<ArticleEntity> listPage = articleMapper.selectArticleInPage(page, article);
+
+ List<ArticleData> list = new ArrayList<>();
+ for (ArticleEntity record : listPage.getRecords()) {
+ ArticleData articleData = entityToData(record);
+ list.add(articleData);
+ }
+
+ node.setData(list);
}
public ArticleData entityToData(ArticleEntity article) {
--
Gitblit v1.9.1