diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java index 9e4403d3..a8ee9717 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java @@ -539,10 +539,6 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl listDict) { if (StrUtil.isBlank(value)) { - return "零部件名称不能为空"; + return "零部件名称不能为空。"; } // 检查工作组 if (!excelUtils.validDict("part_name", value, null, null, true, listDict)) { @@ -440,7 +438,7 @@ public class ExcelUtils { public String validStandardName(String value) { if (StrUtil.isBlank(value)) { - return "新企标名称不能为空"; + return "'新企标名称不能为空'。"; } if (value.length() > 50) { return "'新企标名称'过长(最多50字)。"; 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 61ec840b..297a908d 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 @@ -506,6 +506,9 @@ public class ImportUtil { } public Date convertDate(String cellValue) { + if (StrUtil.isBlank(cellValue)) { + return null; + } SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); // 设置lenient为false,使得日期解析更为严格 sdf.setLenient(false);