From 3c5dfdcf574f5f827b9764fca4062d5ffeb4d7f9 Mon Sep 17 00:00:00 2001 From: 疯狂的狮子Li <15040126243@163.com> Date: 星期三, 16 十一月 2022 09:41:47 +0800 Subject: [PATCH] !248 优化GlobalExceptionHandler.handleServiceException多余的类型转换,脚本乱码。 Merge pull request !248 from scmiot/dev --- ruoyi-common/src/main/java/com/ruoyi/common/convert/ExcelDictConvert.java | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/convert/ExcelDictConvert.java b/ruoyi-common/src/main/java/com/ruoyi/common/convert/ExcelDictConvert.java index ca4303e..03dad1f 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/convert/ExcelDictConvert.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/convert/ExcelDictConvert.java @@ -2,6 +2,7 @@ import cn.hutool.core.annotation.AnnotationUtil; import cn.hutool.core.convert.Convert; +import cn.hutool.core.util.ObjectUtil; import com.alibaba.excel.converters.Converter; import com.alibaba.excel.enums.CellDataTypeEnum; import com.alibaba.excel.metadata.GlobalConfiguration; @@ -51,7 +52,7 @@ @Override public WriteCellData<String> convertToExcelData(Object object, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) { - if (StringUtils.isNull(object)) { + if (ObjectUtil.isNull(object)) { return new WriteCellData<>(""); } ExcelDictFormat anno = getAnnotation(contentProperty.getField()); -- Gitblit v1.9.3