From 33b8bad7235d4c611f14af4819b83554d35ce82a Mon Sep 17 00:00:00 2001
From: whycxzp <perryhsu@163.com>
Date: 星期三, 19 十月 2022 08:52:54 +0800
Subject: [PATCH] 更新

---
 src/main/java/com/whyc/service/ExcelExportService.java |   24 ++++++++++++++----------
 1 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/whyc/service/ExcelExportService.java b/src/main/java/com/whyc/service/ExcelExportService.java
index 04510be..55b3fc1 100644
--- a/src/main/java/com/whyc/service/ExcelExportService.java
+++ b/src/main/java/com/whyc/service/ExcelExportService.java
@@ -74,18 +74,22 @@
         map.put("dto", info);
         //鍥剧墖
         BASE64Decoder decoder = new BASE64Decoder();
-        ImageEntity volImage = new ImageEntity();
-        volImage.setData(decoder.decodeBuffer(info.getVolPic().substring(info.getVolPic().indexOf(",")+1)));
-        volImage.setColspan(6);
-        volImage.setRowspan(17);
+        if(!info.getVolPic().equals("")) {
+            ImageEntity volImage = new ImageEntity();
+            volImage.setData(decoder.decodeBuffer(info.getVolPic().substring(info.getVolPic().indexOf(",") + 1)));
+            volImage.setColspan(6);
+            volImage.setRowspan(17);
 
-        ImageEntity resImage = new ImageEntity();
-        resImage.setData(decoder.decodeBuffer(info.getResPic().substring(info.getResPic().indexOf(",")+1)));
-        resImage.setColspan(6);
-        resImage.setRowspan(16);
+            map.put("volImage",volImage);
+        }
+        if(!info.getResPic().equals("")) {
+            ImageEntity resImage = new ImageEntity();
+            resImage.setData(decoder.decodeBuffer(info.getResPic().substring(info.getResPic().indexOf(",") + 1)));
+            resImage.setColspan(6);
+            resImage.setRowspan(16);
 
-        map.put("volImage",volImage);
-        map.put("resImage",resImage);
+            map.put("resImage", resImage);
+        }
 
         //map.put("volImage","volImage");
         //map.put("resImage","resImage");

--
Gitblit v1.9.1