Commit d221cc54 authored by 高建强's avatar 高建强

item:知识库bug解决

parent 781e14a6
...@@ -39,7 +39,7 @@ class SqlStatement extends BaseSqlCondition { ...@@ -39,7 +39,7 @@ class SqlStatement extends BaseSqlCondition {
private static final Map<String, String[]> valueTagFieldSqlMap; private static final Map<String, String[]> valueTagFieldSqlMap;
private static final Pattern numberPattern = Pattern.compile("^[-\\+]?[\\d]+[.]?[\\d]*$"); private static final Pattern numberPattern = Pattern.compile("^[-\\+]?[\\d]+[.]?[\\d]*$");
private static final Pattern datePattern = Pattern.compile("^[\\d]{4}-[\\d]{2}-[\\d]{2} [\\d]{2}:[\\d]{2}:[\\d]{2}$"); private static final Pattern datePattern = Pattern.compile("^[\\d]{4}-[\\d]{2}-[\\d]{2} [\\d]{2}:[\\d]{2}:[\\d]{2}$");
private static final Pattern datePattern13 = Pattern.compile("^[\\d]{4}/[\\d]{2}/[\\d]{2} [\\d]{2}:[\\d]{2}$"); private static final Pattern datePattern16 = Pattern.compile("^[\\d]{4}/[\\d]{2}/[\\d]{2} [\\d]{2}:[\\d]{2}$");
/** /**
* 字段类型 * 字段类型
...@@ -102,10 +102,10 @@ class SqlStatement extends BaseSqlCondition { ...@@ -102,10 +102,10 @@ class SqlStatement extends BaseSqlCondition {
return false; return false;
} }
boolean emptyVal = ValidationUtil.isEmpty(values); boolean emptyVal = ValidationUtil.isEmpty(values);
if (fieldType != FieldType.textTag) { if (fieldType != FieldType.textTag && values.size() > 0) {
String val1 = values.get(0); String val1 = values.get(0);
String val2 = ""; String val2 = "";
switch (valueType) { switch (valueType) {
case text: case text:
//格式化 //格式化
if (!emptyVal && !ValidationUtil.isEmpty(val1)) { if (!emptyVal && !ValidationUtil.isEmpty(val1)) {
...@@ -117,7 +117,7 @@ class SqlStatement extends BaseSqlCondition { ...@@ -117,7 +117,7 @@ class SqlStatement extends BaseSqlCondition {
// 校验并格式化 // 校验并格式化
if (!emptyVal && !ValidationUtil.isEmpty(val1)) { if (!emptyVal && !ValidationUtil.isEmpty(val1)) {
if (val1.contains("/") && val1.length() == 16) { if (val1.contains("/") && val1.length() == 16) {
paramValidate(datePattern13, val1); paramValidate(datePattern16, val1);
} else { } else {
paramValidate(datePattern, val1); paramValidate(datePattern, val1);
} }
...@@ -127,7 +127,7 @@ class SqlStatement extends BaseSqlCondition { ...@@ -127,7 +127,7 @@ class SqlStatement extends BaseSqlCondition {
val2 = values.get(1); val2 = values.get(1);
if (!emptyVal && !ValidationUtil.isEmpty(val2)) { if (!emptyVal && !ValidationUtil.isEmpty(val2)) {
if (val2.contains("/") && val1.length() == 16) { if (val2.contains("/") && val1.length() == 16) {
paramValidate(datePattern13, val2); paramValidate(datePattern16, val2);
} else { } else {
paramValidate(datePattern, val2); paramValidate(datePattern, val2);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment