From 4351e71d782741143a98f86f6648acd16689165f Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 27 May 2022 19:48:02 +0800
Subject: [PATCH] Merge branch 'developer' into hive2.0
---
zq-erp/src/main/java/com/matrix/system/app/action/ApiKnowledgeAction.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/app/action/ApiKnowledgeAction.java b/zq-erp/src/main/java/com/matrix/system/app/action/ApiKnowledgeAction.java
index 412a3a4..5aaab06 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/action/ApiKnowledgeAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/action/ApiKnowledgeAction.java
@@ -4,9 +4,11 @@
import com.matrix.core.pojo.PaginationVO;
import com.matrix.system.app.dto.ArticleListDto;
import com.matrix.system.hive.action.BaseController;
+import com.matrix.system.hive.action.util.QueryUtil;
import com.matrix.system.hive.bean.Article;
import com.matrix.system.hive.bean.ArticleType;
import com.matrix.system.hive.bean.SysShopInfo;
+import com.matrix.system.hive.dao.ArticleDao;
import com.matrix.system.hive.dao.SysShopInfoDao;
import com.matrix.system.hive.service.ArticleService;
import com.matrix.system.hive.service.ArticleTypeService;
@@ -27,6 +29,7 @@
@Autowired
private ArticleTypeService articleTypeService;
+
@Autowired
private ArticleService articleService;
@@ -35,7 +38,6 @@
public AjaxResult findKnowledgeType() {
ArticleType type = new ArticleType();
type.setCompanyId(getMe().getCompanyId());
- type.setParentId(0L);
return AjaxResult.buildSuccessInstance(articleTypeService.findByModel(type));
}
@@ -47,6 +49,7 @@
pageVo.setLimit(articleListDto.getPageSize());
Article article = new Article();
+ QueryUtil.setQueryLimitCom(article);
article.setTypeId(articleListDto.getTypeId());
return AjaxResult.buildSuccessInstance(articleService.findApiArticleListInPage(article, pageVo));
}
--
Gitblit v1.9.1