diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java index da4471ca..087beb9c 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java @@ -1811,7 +1811,7 @@ public class LawsCommonServiceImpl implements ILawsCommonService { // 如果是企标的话手动添加稽查内容字段 if (TableNameEnum.ENTERPRISE_STANDARDS.getTableName().equals(tableName)) { LawsTag inspectContentTag = new LawsTag(); - inspectContentTag.setDbFieldTxt("稽查内容"); + inspectContentTag.setDbFieldTxt("监察内容"); inspectContentTag.setFieldShowType(FieldShowTypeEnum.INSPECT_CONTENT_FILE_UPLOAD.getValue()); inspectContentTag.setDbFieldName(FieldCommon.CHECK_LIST); inspectContentTag.setFieldMustInput(YesOrNoEnum.NO.getValue()); 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 e04db7d9..24089673 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 @@ -184,7 +184,7 @@ public class ImportUtil { if (FieldCommon.STANDARD_NUMBER.equals(tag.getDbFieldName())) { if (TableNameEnum.ENTERPRISE_STANDARDS.getValue().equals(tag.getIsModel())) { // 使用正则表达式进行基础的格式验证 - if (!cellValue.matches("^[A-Z]{1,2}/[A-Z]{2,} [A-Z]\\d+-\\d{3}-\\d{4}$")) { + if (!cellValue.matches("^[A-Z]{1,2}/[A-Z]{2,} [A-Z]\\d?-\\d+-\\d{3}-\\d{4}$")) { log.error("第" + row + "列输入的" + tag.getDbFieldTxt() + "格式不正确 "); errMsg.append("第").append(row).append("列输入的").append(tag.getDbFieldTxt()).append("格式不正确 "); } else { @@ -398,6 +398,8 @@ public class ImportUtil { String nodeId = treeNodePathMap.get(value); return StrUtil.isNotBlank(nodeId); } + } else { + return false; } } return true;