From 1494d3e47a0dbdc5f49dacd779b5ffab871a2022 Mon Sep 17 00:00:00 2001
From: liuxm <liuxm@fescotech.com>
Date: 星期四, 16 五月 2024 09:21:00 +0800
Subject: [PATCH] 添加查询所有角色

---
 pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/MarkQrCode/ExcelVo.java |   32 ++++++++++++++++++--------------
 1 files changed, 18 insertions(+), 14 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 8baac6b..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
@@ -20,7 +20,7 @@
 
 //鍙傝�冿細  https://easyexcel.opensource.alibaba.com/docs/current/quickstart/write
 @Data
-@HeadRowHeight(40)    //璁剧疆鏍囬楂樺害
+@HeadRowHeight(40) //璁剧疆鏍囬楂樺害
 @HeadFontStyle(fontName="瀹嬩綋", fontHeightInPoints = 16)
 @HeadStyle(wrapped = BooleanEnum.TRUE, shrinkToFit = BooleanEnum.TRUE,
         horizontalAlignment = HorizontalAlignmentEnum.CENTER, verticalAlignment = VerticalAlignmentEnum.CENTER,
@@ -32,8 +32,7 @@
         horizontalAlignment = HorizontalAlignmentEnum.CENTER, verticalAlignment = VerticalAlignmentEnum.CENTER,
         borderLeft = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN,
         leftBorderColor = 8, rightBorderColor = 8, topBorderColor = 8, bottomBorderColor = 8) //IndexedColors.BLACK
-
-@ColumnWidth(16)  //璁剧疆鍒楀
+@ColumnWidth(16) //璁剧疆鍒楀
 public class ExcelVo implements Converter<byte[]> {
     @ExcelProperty("缂栫爜")
     public String code ; //缂栫爜
@@ -45,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