(1)修复字段域导入时获取字典值失败原值被替换为空,影响验证的bug

(2)packet ip ratelimit 字段验证
(3)packet ip 滚动条修复
This commit is contained in:
wangxin
2018-10-19 12:46:15 +08:00
parent 5655f16c32
commit 777e78c167
3 changed files with 24 additions and 6 deletions

View File

@@ -359,7 +359,11 @@ public class ImportExcel {
ExcelField ef = (ExcelField)os[0];
// If is dict type, get dict value
if (StringUtils.isNotBlank(ef.dictType())){
val = DictUtils.getDictCode(ef.dictType(), val.toString(), "");
Object val1 = DictUtils.getDictCode(ef.dictType(), val.toString(), "");
//没有获取到字典值的话会影响验证判断
if(val1!=null&&StringUtils.isNotBlank(val1.toString())) {
val=val1;
}
//log.debug("Dictionary type value: ["+i+","+colunm+"] " + val);
}
// Get param type and type cast