From 198844b47e57c629e99aa0ff9f344163a0851b6a Mon Sep 17 00:00:00 2001 From: thinkgem Date: Fri, 30 Mar 2018 09:01:19 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3Excel=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E4=B8=AD=E7=9A=84DictUtils=E5=8F=8D=E5=B0=84?= =?UTF-8?q?=E6=96=B9=E6=B3=95=E5=8F=82=E6=95=B0=E9=A1=BA=E5=BA=8F=E4=BC=BC?= =?UTF-8?q?=E4=B9=8E=E4=B8=8D=E5=AF=B9=E9=97=AE=E9=A2=98=20#IINDU?= 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 ccf54a01..7a76c966 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 @@ -496,7 +496,7 @@ public class ExcelExport { if (StringUtils.isNotBlank(ef.dictType())){ Class dictUtils = Class.forName("com.jeesite.modules.sys.utils.DictUtils"); val = dictUtils.getMethod("getDictLabel", String.class, String.class, - String.class).invoke(null, val==null?"":val.toString(), ef.dictType(), ""); + String.class).invoke(null, ef.dictType(), val==null?"":val.toString(), ""); //val = DictUtils.getDictLabel(val==null?"":val.toString(), ef.dictType(), ""); } }catch(Exception ex) { 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 1947cad2..8809b130 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 @@ -387,7 +387,7 @@ public class ExcelImport { try{ Class dictUtils = Class.forName("com.jeesite.modules.sys.utils.DictUtils"); val = dictUtils.getMethod("getDictValue", String.class, String.class, - String.class).invoke(null, val.toString(), ef.dictType(), ""); + String.class).invoke(null, ef.dictType(), val.toString(), ""); } catch (Exception ex) { log.info("Get cell value ["+i+","+column+"] error: " + ex.toString()); val = null;