From 652a4973f0aed79341fcc61e4ec1ca51c4d3d437 Mon Sep 17 00:00:00 2001
From: zhangsan <646228430@qq.com>
Date: Mon, 11 Aug 2025 16:51:14 +0800
Subject: [PATCH] =?UTF-8?q?8.11=20=E7=BC=93=E5=AD=98=E4=BC=98=E5=8C=96bug?=
 =?UTF-8?q?=E8=A7=A3=E5=86=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/PictureServiceImpl.java            | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/main/java/edu/whut/smilepicturebackend/service/impl/PictureServiceImpl.java b/src/main/java/edu/whut/smilepicturebackend/service/impl/PictureServiceImpl.java
index de18835..10b7f51 100644
--- a/src/main/java/edu/whut/smilepicturebackend/service/impl/PictureServiceImpl.java
+++ b/src/main/java/edu/whut/smilepicturebackend/service/impl/PictureServiceImpl.java
@@ -619,15 +619,16 @@ public class PictureServiceImpl extends ServiceImpl<PictureMapper, Picture>
             ThrowUtils.throwIf(!hasPermission, ErrorCode.NO_AUTH_ERROR);
         }
 
-        // 把查询条件序列化成 JSON
-        String queryJson = JSONUtil.toJsonStr(Map.of(
+        Map<String, Object> params = Map.of(
                 "spaceId", spaceId == null ? "public" : spaceId,
-                "category", queryRequest.getCategory(),
-                "tags", queryRequest.getTags(),
-                "searchText", queryRequest.getSearchText(),
+                "category", Optional.ofNullable(queryRequest.getCategory()).orElse(""),
+                "tags", Optional.ofNullable(queryRequest.getTags()).orElse(Collections.emptyList()),
+                "searchText", Optional.ofNullable(queryRequest.getSearchText()).orElse(""),
                 "current", current,
                 "size", size
-        ));
+        );
+        // 把查询条件序列化成 JSON
+        String queryJson = JSONUtil.toJsonStr(params);
 
         // 计算 MD5 作为哈希（也可用 SHA256）
         String hash = DigestUtil.md5Hex(queryJson);