diff --git a/easyexcel-core/src/main/java/com/alibaba/excel/write/executor/ExcelWriteFillExecutor.java b/easyexcel-core/src/main/java/com/alibaba/excel/write/executor/ExcelWriteFillExecutor.java index 10223be1..81524223 100644 --- a/easyexcel-core/src/main/java/com/alibaba/excel/write/executor/ExcelWriteFillExecutor.java +++ b/easyexcel-core/src/main/java/com/alibaba/excel/write/executor/ExcelWriteFillExecutor.java @@ -212,10 +212,10 @@ public class ExcelWriteFillExecutor extends AbstractExcelWriteExecutor { if (analysisCell.getOnlyOneVariable()) { String variable = analysisCell.getVariableList().get(0); - Object value =null; - if (dataKeySet.contains(variable)) { - value = dataMap.get(variable); + if (!dataKeySet.contains(variable)) { + continue; } + Object value = dataMap.get(variable); ExcelContentProperty excelContentProperty = ClassUtils.declaredExcelContentProperty(dataMap, writeContext.currentWriteHolder().excelWriteHeadProperty().getHeadClazz(), variable, writeContext.currentWriteHolder()); @@ -247,10 +247,10 @@ public class ExcelWriteFillExecutor extends AbstractExcelWriteExecutor { for (String variable : analysisCell.getVariableList()) { cellValueBuild.append(analysisCell.getPrepareDataList().get(index++)); - Object value =null; - if (dataKeySet.contains(variable)) { - value = dataMap.get(variable); + if (!dataKeySet.contains(variable)) { + continue; } + Object value = dataMap.get(variable); ExcelContentProperty excelContentProperty = ClassUtils.declaredExcelContentProperty(dataMap, writeContext.currentWriteHolder().excelWriteHeadProperty().getHeadClazz(), variable, writeContext.currentWriteHolder()); diff --git a/img/style/idea/step1.png b/img/style/idea/step1.png index d4a39f55..770689d3 100644 Binary files a/img/style/idea/step1.png and b/img/style/idea/step1.png differ diff --git a/img/style/idea/step2.png b/img/style/idea/step2.png index 2dd04148..c229879a 100644 Binary files a/img/style/idea/step2.png and b/img/style/idea/step2.png differ diff --git a/img/style/idea/step3.png b/img/style/idea/step3.png index 2fbde4a0..19a2aeed 100644 Binary files a/img/style/idea/step3.png and b/img/style/idea/step3.png differ diff --git a/style/STYLE.md b/style/STYLE.md index cc75b44d..24477f78 100644 --- a/style/STYLE.md +++ b/style/STYLE.md @@ -16,12 +16,12 @@ * 点击`Apply`完成配置 ![step](../img/style/eclipse/step.jpg) #### idea -* 依次点击进入插件界面:`File->Settings->Plugins`,搜索 eclipse code formatter,如已有插件则不需安装,如没有,点击Search in repositories自动搜索线上插件。 +* 依次点击进入插件界面:`File->Settings->Plugins`,搜索 Adapter for Eclipse Code Formatter ,如已有插件则不需安装,如没有,点击Search in repositories自动搜索线上插件。 ![step1](../img/style/idea/step1.png) * 导入`style/eclipse/codestyle.xml` 这里记住用的也是eclipse里面的 点击OK -![step1](../img/style/idea/step2.png) +![step2](../img/style/idea/step2.png) * 依次点击进入插件界面:`File->Settings->Editor->Code Style->Java->Import Scheme->Intellij IDEA code style XML`,导入`style/idea/codestyle.xml` 这里用的是idea的配置文件 -![step1](../img/style/idea/step3.png) +![step3](../img/style/idea/step3.png) * 完成 ### 附