From 712538213b7414a9ba2c69abb95adb4574f7c102 Mon Sep 17 00:00:00 2001
From: TinyAnts <tinyants@163.com>
Date: Mon, 9 Jan 2023 19:00:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86=E6=96=87?=
 =?UTF-8?q?=E7=AB=A0=E6=95=B0=E6=8D=AE=E8=8E=B7=E5=8F=96=E4=B8=8D=E5=88=B0?=
 =?UTF-8?q?=E5=88=86=E7=B1=BB=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../front/controller/ArticleController.java   |  2 ++
 .../mdd/front/service/impl/PcServiceImpI.java |  2 +-
 .../front/validate/ArticleSearchValidate.java | 19 +++++++++++++++++++
 3 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 server/like-front/src/main/java/com/mdd/front/validate/ArticleSearchValidate.java

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<PageResult<ArticleListedVo>> list(@Validated PageValidate pageValidate,
+                                                        @Validated ArticleSearchValidate searchValidate,
                                                         @RequestParam(value = "cid", defaultValue = "0") Integer cid) {
         Integer userId = LikeFrontThreadLocal.getUserId();
         PageResult<ArticleListedVo> 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<ArticleCategory>()
-                    .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;
+
+}