diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/AutoPoiDictConfig.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/AutoPoiDictConfig.java index 52608ae0..d5e6c164 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/AutoPoiDictConfig.java +++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/AutoPoiDictConfig.java @@ -17,9 +17,9 @@ import java.util.List; * 举例: @Excel(name = "性别", width = 15, dicCode = "sex") * 1、导出的时候会根据字典配置,把值1,2翻译成:男、女; * 2、导入的时候,会把男、女翻译成1,2存进数据库; - * - * @Author:scott - * @since:2019-04-09 + * + * @Author:scott + * @since:2019-04-09 * @Version:1.0 */ @Slf4j @@ -31,14 +31,14 @@ public class AutoPoiDictConfig implements AutoPoiDictServiceI { /** * 通过字典查询easypoi,所需字典文本 - * - * @Author:scott + * + * @Author:scott * @since:2019-04-09 * @return */ @Override public String[] queryDict(String dicTable, String dicCode, String dicText) { - List dictReplaces = new ArrayList(); + List dictReplaces = new ArrayList<>(); List dictList = null; // step.1 如果没有字典表则使用系统字典表 if (oConvertUtils.isEmpty(dicTable)) { @@ -56,10 +56,10 @@ public class AutoPoiDictConfig implements AutoPoiDictServiceI { dictReplaces.add(t.getText() + "_" + t.getValue()); } } - if (dictReplaces != null && dictReplaces.size() != 0) { + if (!dictReplaces.isEmpty()) { log.info("---AutoPoi--Get_DB_Dict------"+ dictReplaces.toString()); return dictReplaces.toArray(new String[dictReplaces.size()]); } - return null; + return new String[0]; } }