diff --git a/server/like-front/src/main/java/com/mdd/front/controller/ArticleController.java b/server/like-front/src/main/java/com/mdd/front/controller/ArticleController.java index 14a2865b..31e8224a 100644 --- a/server/like-front/src/main/java/com/mdd/front/controller/ArticleController.java +++ b/server/like-front/src/main/java/com/mdd/front/controller/ArticleController.java @@ -6,6 +6,7 @@ import com.mdd.common.validator.annotation.IDMust; import com.mdd.front.LikeFrontThreadLocal; import com.mdd.front.service.IArticleService; import com.mdd.front.validate.ArticleCollectValidate; +import com.mdd.front.validate.ArticleSearchValidate; import com.mdd.front.validate.commons.PageValidate; import com.mdd.front.vo.article.ArticleCateVo; import com.mdd.front.vo.article.ArticleCollectVo; @@ -47,6 +48,7 @@ public class ArticleController { */ @GetMapping("/list") public AjaxResult> list(@Validated PageValidate pageValidate, + @Validated ArticleSearchValidate searchValidate, @RequestParam(value = "cid", defaultValue = "0") Integer cid) { Integer userId = LikeFrontThreadLocal.getUserId(); PageResult list = iArticleService.list(pageValidate, cid, userId); diff --git a/server/like-front/src/main/java/com/mdd/front/service/impl/PcServiceImpI.java b/server/like-front/src/main/java/com/mdd/front/service/impl/PcServiceImpI.java index 8676b452..d12b2265 100644 --- a/server/like-front/src/main/java/com/mdd/front/service/impl/PcServiceImpI.java +++ b/server/like-front/src/main/java/com/mdd/front/service/impl/PcServiceImpI.java @@ -228,7 +228,7 @@ public class PcServiceImpI implements IPcService { // 分类名称 ArticleCategory articleCategory = articleCategoryMapper.selectOne( new QueryWrapper() - .eq("id", article.getId()) + .eq("id", article.getCid()) .eq("is_delete", 0)); // 上一条记录 diff --git a/server/like-front/src/main/java/com/mdd/front/validate/ArticleSearchValidate.java b/server/like-front/src/main/java/com/mdd/front/validate/ArticleSearchValidate.java new file mode 100644 index 00000000..3192a356 --- /dev/null +++ b/server/like-front/src/main/java/com/mdd/front/validate/ArticleSearchValidate.java @@ -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; + +}