From e635881ecb6b633c819c6ac4cd6a5dfe6380b888 Mon Sep 17 00:00:00 2001 From: thinkgem Date: Wed, 22 Apr 2020 11:39:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=20excel=20=E5=B7=A5=E5=85=B7?= =?UTF-8?q?=E5=AD=97=E5=85=B8=E6=95=B0=E6=8D=AE=E5=A4=9A=E4=B8=AA=E7=9A=84?= =?UTF-8?q?=E6=97=B6=E5=80=99=E8=A7=A3=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/jeesite/common/utils/excel/ExcelExport.java | 2 +- .../main/java/com/jeesite/common/utils/excel/ExcelImport.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common/src/main/java/com/jeesite/common/utils/excel/ExcelExport.java b/common/src/main/java/com/jeesite/common/utils/excel/ExcelExport.java index 750e327b..ff9ed47c 100644 --- a/common/src/main/java/com/jeesite/common/utils/excel/ExcelExport.java +++ b/common/src/main/java/com/jeesite/common/utils/excel/ExcelExport.java @@ -539,7 +539,7 @@ public class ExcelExport implements Closeable{ // If is dict, get dict label if (StringUtils.isNotBlank(ef.dictType())){ Class dictUtils = Class.forName("com.jeesite.modules.sys.utils.DictUtils"); - val = dictUtils.getMethod("getDictLabel", String.class, String.class, + val = dictUtils.getMethod("getDictLabels", String.class, String.class, String.class).invoke(null, ef.dictType(), val==null?"":val.toString(), ""); //val = DictUtils.getDictLabel(val==null?"":val.toString(), ef.dictType(), ""); } diff --git a/common/src/main/java/com/jeesite/common/utils/excel/ExcelImport.java b/common/src/main/java/com/jeesite/common/utils/excel/ExcelImport.java index 287dc8df..6da81d0b 100644 --- a/common/src/main/java/com/jeesite/common/utils/excel/ExcelImport.java +++ b/common/src/main/java/com/jeesite/common/utils/excel/ExcelImport.java @@ -405,7 +405,7 @@ public class ExcelImport implements Closeable { if (StringUtils.isNotBlank(ef.dictType())){ try{ Class dictUtils = Class.forName("com.jeesite.modules.sys.utils.DictUtils"); - val = dictUtils.getMethod("getDictValue", String.class, String.class, + val = dictUtils.getMethod("getDictValues", String.class, String.class, String.class).invoke(null, ef.dictType(), val.toString(), ""); } catch (Exception ex) { log.info("Get cell value ["+i+","+column+"] error: " + ex.toString());