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 | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 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 ca4fc07..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,8 +4,12 @@
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;
import io.swagger.annotations.Api;
@@ -25,6 +29,7 @@
@Autowired
private ArticleTypeService articleTypeService;
+
@Autowired
private ArticleService articleService;
@@ -32,8 +37,7 @@
@GetMapping(value = "/findKnowledgeType")
public AjaxResult findKnowledgeType() {
ArticleType type = new ArticleType();
- type.setShopId(getMe().getShopId());
- type.setParentId(0L);
+ type.setCompanyId(getMe().getCompanyId());
return AjaxResult.buildSuccessInstance(articleTypeService.findByModel(type));
}
@@ -45,8 +49,18 @@
pageVo.setLimit(articleListDto.getPageSize());
Article article = new Article();
+ QueryUtil.setQueryLimitCom(article);
article.setTypeId(articleListDto.getTypeId());
return AjaxResult.buildSuccessInstance(articleService.findApiArticleListInPage(article, pageVo));
}
+ @ApiOperation(value = "获取文章详情页", notes = "获取文章详情页")
+ @GetMapping(value = "/findArticleDetail/{id}")
+ public AjaxResult findArticleDetail(@PathVariable("id") Long id) {
+ Article article = articleService.findById(id);
+ AjaxResult ajaxResult = AjaxResult.buildSuccessInstance("获取成功");
+ ajaxResult.putInMap("article", article);
+ return ajaxResult;
+ }
+
}
--
Gitblit v1.9.1