From 9e7187ed49650f4bc5800d270c8e75b7ded6ca23 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Tue, 6 Aug 2024 16:18:24 +0800 Subject: [PATCH] =?UTF-8?q?fix:=2087518=20=E4=BC=81=E4=B8=9A=E6=A0=87?= =?UTF-8?q?=E5=87=86-=E5=AF=BC=E5=85=A5=20=E5=AF=BC=E5=85=A5=E6=AD=A3?= =?UTF-8?q?=E7=A1=AE=E6=95=B0=E6=8D=AE=EF=BC=8C=E5=AF=BC=E4=B8=8D=E8=BF=9B?= =?UTF-8?q?=E5=8E=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/modules/laws/common/util/ImportUtil.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/util/ImportUtil.java b/laws-modules/src/main/java/com/jero/modules/laws/common/util/ImportUtil.java index 952d3507..83b1b038 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/util/ImportUtil.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/util/ImportUtil.java @@ -336,9 +336,12 @@ public class ImportUtil { } // 单选时间 if (FieldShowTypeEnum.YEAR_SELECT.getValue().equals(tag.getFieldShowType())) { - if (!this.yearValid(cellValue)) { - log.error("第" + row + "列" + tag.getDbFieldTxt() + "填写错误 "); - errMsg.append("第").append(row).append("列").append(tag.getDbFieldTxt()).append("填写错误 "); + if (StrUtil.isNotBlank(cellValue)) { + cellValue = cellValue.trim().split("\\.")[0]; + if (!this.yearValid(cellValue)) { + log.error("第" + row + "列" + tag.getDbFieldTxt() + "填写错误 "); + errMsg.append("第").append(row).append("列").append(tag.getDbFieldTxt()).append("填写错误 "); + } } }