From 13123f8f9d77ce6cb53ebf4993a71a1f68ce099e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E7=B2=BE=E5=8D=8E?= <842761733@qq.com> Date: Mon, 27 May 2019 16:14:51 +0800 Subject: [PATCH] =?UTF-8?q?addTask=E8=BD=AC=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/keking/service/impl/OfficeFilePreviewImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jodconverter-web/src/main/java/cn/keking/service/impl/OfficeFilePreviewImpl.java b/jodconverter-web/src/main/java/cn/keking/service/impl/OfficeFilePreviewImpl.java index 72f22105..5e2600a9 100644 --- a/jodconverter-web/src/main/java/cn/keking/service/impl/OfficeFilePreviewImpl.java +++ b/jodconverter-web/src/main/java/cn/keking/service/impl/OfficeFilePreviewImpl.java @@ -47,7 +47,7 @@ public class OfficeFilePreviewImpl implements FilePreview { public String filePreviewHandle(String url, Model model) { // 预览Type，参数传了就取参数的，没传取系统默认 String officePreviewType = model.asMap().get("officePreviewType") == null ? ConfigConstants.getOfficePreviewType() : model.asMap().get("officePreviewType").toString(); - String originUrl = model.asMap().get("originUrl").toString(); + String originUrl = (String) model.asMap().get("originUrl"); FileAttribute fileAttribute=fileUtils.getFileAttribute(url); String suffix=fileAttribute.getSuffix(); String fileName=fileAttribute.getName(); @@ -81,7 +81,7 @@ public class OfficeFilePreviewImpl implements FilePreview { fileUtils.addConvertedFile(pdfName, fileUtils.getRelativePath(outFilePath)); } } - if (!isHtml && (OFFICE_PREVIEW_TYPE_IMAGE.equals(officePreviewType) || OFFICE_PREVIEW_TYPE_ALLIMAGES.equals(officePreviewType))) { + if (!isHtml && originUrl != null && (OFFICE_PREVIEW_TYPE_IMAGE.equals(officePreviewType) || OFFICE_PREVIEW_TYPE_ALLIMAGES.equals(officePreviewType))) { List imageUrls = pdfUtils.pdf2jpg(outFilePath, pdfName, originUrl); if (imageUrls == null || imageUrls.size() < 1) { model.addAttribute("msg", "office转图片异常，请联系管理员");