From 530385f0901cb838540bc3f83d573686eb3a3bb4 Mon Sep 17 00:00:00 2001
From: liuxm <liuxm@fescotech.com>
Date: 星期四, 16 五月 2024 17:48:47 +0800
Subject: [PATCH] 按功能点添加权限;工站添加生产线关联

---
 pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/MarkQrCode/ExcelVo.java |   27 ++++++++++++++++-----------
 1 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/MarkQrCode/ExcelVo.java b/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/MarkQrCode/ExcelVo.java
index bc8fc4c..c4d5807 100644
--- a/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/MarkQrCode/ExcelVo.java
+++ b/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/MarkQrCode/ExcelVo.java
@@ -44,17 +44,22 @@
 
     public WriteCellData<?> convertToExcelData(byte[] value, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) throws Exception {
         WriteCellData cellData = new WriteCellData()  ;
-        List<ImageData> list = new ArrayList<>();
-        ImageData imd = new ImageData();
-        imd.setImage(value);
-        imd.setImageType(ImageData.ImageType.PICTURE_TYPE_PICT);
-        imd.setLeft(10);
-        imd.setTop(10);
-        imd.setRight(10);
-        imd.setBottom(10);
-        list.add(imd) ;
-        cellData.setImageDataList(list);
-        cellData.setType(CellDataTypeEnum.EMPTY);
+        if(value != null && value.length >0){
+            List<ImageData> list = new ArrayList<>();
+            ImageData imd = new ImageData();
+            imd.setImage(value);
+            imd.setImageType(ImageData.ImageType.PICTURE_TYPE_PICT);
+            imd.setLeft(10);
+            imd.setTop(10);
+            imd.setRight(10);
+            imd.setBottom(10);
+            list.add(imd) ;
+            cellData.setImageDataList(list);
+            cellData.setType(CellDataTypeEnum.EMPTY);
+        }else{
+            cellData.setStringValue("");
+            cellData.setType(CellDataTypeEnum.STRING);
+        }
         return cellData;
     }
 

--
Gitblit v1.8.0