|
|
@@ -375,10 +375,12 @@ public class ConceptFacade extends ConceptServiceImpl {
|
|
|
lineNumStr = "第" + addConceptInfoVO.getLineNum() + "行";
|
|
|
}
|
|
|
|
|
|
- String regEx = "[0-9]+|[`~·!@#$%^&*()+=|{}':;',\\[\\].<>/?~！@#￥%……&*（）——+|{}【】‘；：”“’。，、？]+";
|
|
|
+ //String regEx = "[0-9]+|[`~·!@#$%^&*()+=|{}':;',\\[\\].<>/?~！@#￥%……&*（）——+|{}【】‘；：”“’。，、？]+";
|
|
|
+ String regEx = "[0-9]+";
|
|
|
for (AddConceptInfoDetailVO i : addConceptInfoVO.getDetailList()) {
|
|
|
if (i.getName().matches(regEx)) {
|
|
|
- throw new CommonException(CommonErrorCode.RPC_ERROR, lineNumStr + "无法输入纯数字或者纯字符，请输入正确数据！");
|
|
|
+ //throw new CommonException(CommonErrorCode.RPC_ERROR, lineNumStr + "无法输入纯数字或者纯字符，请输入正确数据！");
|
|
|
+ throw new CommonException(CommonErrorCode.RPC_ERROR, lineNumStr + "无法输入纯数字，请输入正确数据！");
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -563,7 +565,8 @@ public class ConceptFacade extends ConceptServiceImpl {
|
|
|
Sheet sheet = wb.getSheetAt(0);
|
|
|
int count = 0;
|
|
|
String libName, libType, otherNames, remark, sexType, minAge, maxAge;
|
|
|
- String regEx = "[0-9]+|[`~·!@#$%^&*()+=|{}':;',\\[\\].<>/?~！@#￥%……&*（）——+|{}【】‘；：”“’。，、？]+";
|
|
|
+ //String regEx = "[0-9]+|[`~·!@#$%^&*()+=|{}':;',\\[\\].<>/?~！@#￥%……&*（）——+|{}【】‘；：”“’。，、？]+";
|
|
|
+ String regEx = "[0-9]+";
|
|
|
String regExAge = "[0-9]|[1-9][0-9]|1[0-9]{2}|200";
|
|
|
for (Row row : sheet) {
|
|
|
count++;
|
|
|
@@ -647,7 +650,7 @@ public class ConceptFacade extends ConceptServiceImpl {
|
|
|
continue;
|
|
|
}
|
|
|
if (nm.matches(regEx)) {
|
|
|
- sbf.append("第" + count + "行无法导入，导入数据无法为纯数字或纯特殊字符；").append("<br/>");
|
|
|
+ sbf.append("第" + count + "行无法导入，导入数据无法为纯数字；").append("<br/>");
|
|
|
break;
|
|
|
}
|
|
|
if (nm.length() > 30) {
|
rgb