From da94e89825eb70bf05f245c73f48567c109b8887 Mon Sep 17 00:00:00 2001
From: itino <yaogogo@88.com>
Date: 星期四, 17 十一月 2022 16:41:30 +0800
Subject: [PATCH] add 新增字典数据映射注解，可根据字段数据（sys_dict_data表）.dict_type 转换对应的 value 和 label
---
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