From 812f24d16d615fd7887edac60bc1bbe2f44f9516 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Mon, 6 Mar 2023 14:58:23 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90fix=20sonar=E3=80=91AutoPoiDictConfig?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jero/config/AutoPoiDictConfig.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) 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]; } }