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 list(@RequestBody List names) { - List fontContents = fontService.listFontsByNames(names); - if (fontContents == null) { - return new ArrayList<>(); - } - return fontContents; + public List list(@RequestBody List 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 { * @param fontNameList 字体族名称列表 * @return 字体列表 */ - List listFontsByNames(List fontNameList); + List listFontsByNames(List 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 implements FontS } @Override - public List listFontsByNames(List fontNameList) { + public List listFontsByNames(List fontNameList) { if (CollectionUtils.isEmpty(fontNameList)) { return null; } - // 从MySQL查询字体内容 List fonts = this.list(new LambdaQueryWrapper() - .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