修复部分文章数据获取不到分类的问题
This commit is contained in:
parent
97518d66d3
commit
712538213b
|
|
@ -6,6 +6,7 @@ import com.mdd.common.validator.annotation.IDMust;
|
||||||
import com.mdd.front.LikeFrontThreadLocal;
|
import com.mdd.front.LikeFrontThreadLocal;
|
||||||
import com.mdd.front.service.IArticleService;
|
import com.mdd.front.service.IArticleService;
|
||||||
import com.mdd.front.validate.ArticleCollectValidate;
|
import com.mdd.front.validate.ArticleCollectValidate;
|
||||||
|
import com.mdd.front.validate.ArticleSearchValidate;
|
||||||
import com.mdd.front.validate.commons.PageValidate;
|
import com.mdd.front.validate.commons.PageValidate;
|
||||||
import com.mdd.front.vo.article.ArticleCateVo;
|
import com.mdd.front.vo.article.ArticleCateVo;
|
||||||
import com.mdd.front.vo.article.ArticleCollectVo;
|
import com.mdd.front.vo.article.ArticleCollectVo;
|
||||||
|
|
@ -47,6 +48,7 @@ public class ArticleController {
|
||||||
*/
|
*/
|
||||||
@GetMapping("/list")
|
@GetMapping("/list")
|
||||||
public AjaxResult<PageResult<ArticleListedVo>> list(@Validated PageValidate pageValidate,
|
public AjaxResult<PageResult<ArticleListedVo>> list(@Validated PageValidate pageValidate,
|
||||||
|
@Validated ArticleSearchValidate searchValidate,
|
||||||
@RequestParam(value = "cid", defaultValue = "0") Integer cid) {
|
@RequestParam(value = "cid", defaultValue = "0") Integer cid) {
|
||||||
Integer userId = LikeFrontThreadLocal.getUserId();
|
Integer userId = LikeFrontThreadLocal.getUserId();
|
||||||
PageResult<ArticleListedVo> list = iArticleService.list(pageValidate, cid, userId);
|
PageResult<ArticleListedVo> list = iArticleService.list(pageValidate, cid, userId);
|
||||||
|
|
|
||||||
|
|
@ -228,7 +228,7 @@ public class PcServiceImpI implements IPcService {
|
||||||
// 分类名称
|
// 分类名称
|
||||||
ArticleCategory articleCategory = articleCategoryMapper.selectOne(
|
ArticleCategory articleCategory = articleCategoryMapper.selectOne(
|
||||||
new QueryWrapper<ArticleCategory>()
|
new QueryWrapper<ArticleCategory>()
|
||||||
.eq("id", article.getId())
|
.eq("id", article.getCid())
|
||||||
.eq("is_delete", 0));
|
.eq("is_delete", 0));
|
||||||
|
|
||||||
// 上一条记录
|
// 上一条记录
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,19 @@
|
||||||
|
package com.mdd.front.validate;
|
||||||
|
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
import java.io.Serializable;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 文章搜索参数
|
||||||
|
*/
|
||||||
|
@Data
|
||||||
|
public class ArticleSearchValidate implements Serializable {
|
||||||
|
|
||||||
|
private static final long serialVersionUID = 1L;
|
||||||
|
|
||||||
|
private String keyword;
|
||||||
|
|
||||||
|
private String sort;
|
||||||
|
|
||||||
|
}
|
||||||
Loading…
Reference in New Issue