From 04302b065b730b1269aac246c57f6e06bea667d3 Mon Sep 17 00:00:00 2001
From: lizhengwei <lizhengwei@dcrays.cn>
Date: Wed, 26 Nov 2025 15:27:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E4=BD=93=E6=9F=A5=E8=AF=A2=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E5=AE=9E=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/luban/api/controller/FontController.java   |  8 ++------
 .../java/com/luban/api/service/FontService.java    |  2 +-
 .../luban/api/service/impl/FontServiceImpl.java    | 14 ++++----------
 3 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/FontController.java b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/FontController.java
index 2097d4ed7..d81701dae 100644
--- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/FontController.java
+++ b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/FontController.java
@@ -39,12 +39,8 @@ public class FontController {
 
     @Operation(summary = "根据字体族名称列表查询字体")
     @PostMapping("list")
-    public List<String> list(@RequestBody List<String> names) {
-        List<String> fontContents = fontService.listFontsByNames(names);
-        if (fontContents == null) {
-            return new ArrayList<>();
-        }
-        return fontContents;
+    public List<Font> list(@RequestBody List<String> names) {
+        return fontService.listFontsByNames(names);
     }
 
     @Operation(summary = "根据ID获取字体详情")
diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/FontService.java b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/FontService.java
index 5d1c14c93..de8bc1865 100644
--- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/FontService.java
+++ b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/FontService.java
@@ -42,7 +42,7 @@ public interface FontService extends IService<Font> {
      * @param fontNameList 字体族名称列表
      * @return 字体列表
      */
-    List<String> listFontsByNames(List<String> fontNameList);
+    List<Font> listFontsByNames(List<String> fontNameList);
 
     /**
      * 根据ID获取字体详情
diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/impl/FontServiceImpl.java b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/impl/FontServiceImpl.java
index 5999f2f9e..1ea92895d 100644
--- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/impl/FontServiceImpl.java
+++ b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/impl/FontServiceImpl.java
@@ -71,24 +71,18 @@ public class FontServiceImpl extends ServiceImpl<FontDao, Font> implements FontS
     }
 
     @Override
-    public List<String> listFontsByNames(List<String> fontNameList) {
+    public List<Font> listFontsByNames(List<String> fontNameList) {
         if (CollectionUtils.isEmpty(fontNameList)) {
             return null;
         }
 
-        // 从MySQL查询字体内容
         List<Font> fonts = this.list(new LambdaQueryWrapper<Font>()
-                .in(Font::getName, fontNameList)
-                .isNotNull(Font::getContent));
-
+            .in(Font::getName, fontNameList)
+            .isNotNull(Font::getContent));
         if (CollectionUtils.isEmpty(fonts)) {
             return null;
         }
-
-        // 提取JSON内容
-        return fonts.stream()
-                .map(Font::getContent)
-                .collect(Collectors.toList());
+        return fonts;
     }
 
     @Override