From b7b0607eaaeba52cf8be029cfc6293919ce16d8c Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Tue, 14 Sep 2021 08:53:30 +0800
Subject: [PATCH] 版本更新
---
src/main/java/org/springblade/modules/article/controller/ArticleController.java | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/article/controller/ArticleController.java b/src/main/java/org/springblade/modules/article/controller/ArticleController.java
index 2dfc906..cc9befd 100644
--- a/src/main/java/org/springblade/modules/article/controller/ArticleController.java
+++ b/src/main/java/org/springblade/modules/article/controller/ArticleController.java
@@ -49,6 +49,22 @@
}
/**
+ *
+ * 查询资讯分页信息(角色权限)
+ * @param response
+ * @param article 资讯对象
+ * @param query 查询参数
+ * @return
+ */
+ @GetMapping("/pageDate")
+ public R<IPage<Article>> pageDate(HttpServletResponse response, ArticleVo article, Query query){
+ response.setHeader("Access-Control-Allow-Origin", "*");
+ response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
+ response.setHeader("Access-Control-Allow-Credentials","true");
+ return R.data(articleService.pageDate(Condition.getPage(query),article));
+ }
+
+ /**
* 资讯详情
* @param article 资讯查询对象
* @param response
@@ -95,7 +111,9 @@
@ApiOperation(value = "新增或修改", notes = "传入article")
public R submit(@Valid @RequestBody Article article) {
if (null==article.getId()){
- article.setCreateTime(new Date());
+ if (null==article.getCreateTime()){
+ article.setCreateTime(new Date());
+ }
}
article.setUpdateTime(new Date());
return R.status(articleService.saveOrUpdate(article));
--
Gitblit v1.9.3