From 260d9e17776e9cac4475c5b5c2e0f5586d97efeb Mon Sep 17 00:00:00 2001
From: Nice-2-CU <81088875+Nice-2-CU@users.noreply.github.com>
Date: Mon, 20 Feb 2023 13:38:32 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E5=B8=96=E5=AD=90?=
 =?UTF-8?q?=E6=A8=A1=E7=B3=8A=E6=9F=A5=E8=AF=A2bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ctgu/lost_found/controller/PostController.java    | 11 +++++++----
 .../ctgu/lost_found/service/Impl/PostServiceImpl.java |  7 ++++---
 .../java/com/ctgu/lost_found/service/PostService.java |  5 +++--
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/ctgu/lost_found/controller/PostController.java b/src/main/java/com/ctgu/lost_found/controller/PostController.java
index b8a8718..c8698bc 100644
--- a/src/main/java/com/ctgu/lost_found/controller/PostController.java
+++ b/src/main/java/com/ctgu/lost_found/controller/PostController.java
@@ -148,10 +148,13 @@ public class PostController {
         return postService.getPostList(type, itemTypeId);
     }
 
-    @ApiOperation("模糊查询所有帖子(不包括已完成的帖子)")
-    @GetMapping(value = {"/fuzzyGetPostList", "/fuzzyGetPostList/{fuzzyStr}"})
-    public Result fuzzyGetPostList(@PathVariable(value = "fuzzyStr", required = false) String fuzzyStr) {
-        return postService.fuzzyGetPostList(fuzzyStr);
+    @ApiOperation("模糊查询帖子")
+    @GetMapping(value = {"/fuzzyGetPostListByState/{state}", "/fuzzyGetPostList/{fuzzyStr}/{state}"})
+    public Result fuzzyGetPostList(@PathVariable(value = "fuzzyStr", required = false) String fuzzyStr, @PathVariable(value = "state") Integer state) {
+        if (state != 0 && state != 1) {
+            return Result.error("state只能为0或1");
+        }
+        return postService.fuzzyGetPostList(fuzzyStr, state);
     }
 
     @ApiOperation("查询指定用户的所有帖子(包括已完成的帖子)")
diff --git a/src/main/java/com/ctgu/lost_found/service/Impl/PostServiceImpl.java b/src/main/java/com/ctgu/lost_found/service/Impl/PostServiceImpl.java
index 93fbae6..50203f2 100644
--- a/src/main/java/com/ctgu/lost_found/service/Impl/PostServiceImpl.java
+++ b/src/main/java/com/ctgu/lost_found/service/Impl/PostServiceImpl.java
@@ -155,17 +155,18 @@ public class PostServiceImpl implements PostService {
     }
 
     /**
-     * 模糊查询所有帖子(不包括已完成的帖子)
+     * 模糊查询帖子
      *
      * @param fuzzyStr: 模糊查询字符串
+     * @param state:    帖子状态
      * @return Result
      */
     @Override
-    public Result fuzzyGetPostList(String fuzzyStr) {
+    public Result fuzzyGetPostList(String fuzzyStr, Integer state) {
         if ("".equals(fuzzyStr)) {
             fuzzyStr = null;
         }
-        List<Post> postList = postDao.getPostList(null, null, null, null, 0, fuzzyStr);
+        List<Post> postList = postDao.getPostList(null, null, null, null, state, fuzzyStr);
         if (postList.isEmpty()) {
             return Result.error("查询失败，帖子不存在");
         }
diff --git a/src/main/java/com/ctgu/lost_found/service/PostService.java b/src/main/java/com/ctgu/lost_found/service/PostService.java
index 8bd5a9f..f007fae 100644
--- a/src/main/java/com/ctgu/lost_found/service/PostService.java
+++ b/src/main/java/com/ctgu/lost_found/service/PostService.java
@@ -51,12 +51,13 @@ public interface PostService {
     Result getPostList(Integer type, Integer itemTypeId);
 
     /**
-     * 模糊查询所有帖子(不包括已完成的帖子)
+     * 模糊查询帖子
      *
      * @param fuzzyStr: 模糊查询字符串
+     * @param state:    帖子状态
      * @return Result
      */
-    Result fuzzyGetPostList(String fuzzyStr);
+    Result fuzzyGetPostList(String fuzzyStr, Integer state);
 
     /**
      * 查询指定用户发布的所有帖子(包括已完成的帖子)
-- 
Gitee