提交 41deddbb authored 作者: taojinlong's avatar taojinlong

fix: excel 数据集

上级 9124a921
...@@ -661,13 +661,15 @@ public class DataSetTableService { ...@@ -661,13 +661,15 @@ public class DataSetTableService {
for (int j = 0; j < row.getPhysicalNumberOfCells(); j++) { for (int j = 0; j < row.getPhysicalNumberOfCells(); j++) {
if (i == 0) { if (i == 0) {
TableFiled tableFiled = new TableFiled(); TableFiled tableFiled = new TableFiled();
tableFiled.setFieldName(readCell(row.getCell(j)));
tableFiled.setRemarks(readCell(row.getCell(j)));
tableFiled.setFieldType("TEXT"); tableFiled.setFieldType("TEXT");
tableFiled.setFieldSize(1024); tableFiled.setFieldSize(1024);
if(StringUtils.isEmpty(tableFiled.getFieldName())){ String columnName = readCell(row.getCell(j));
continue; if(StringUtils.isEmpty(columnName)){
columnName = "NONE_" + String.valueOf(j);
} }
tableFiled.setFieldName(columnName);
tableFiled.setRemarks(columnName);
fields.add(tableFiled); fields.add(tableFiled);
} else { } else {
r[j] = readCell(row.getCell(j)); r[j] = readCell(row.getCell(j));
...@@ -695,13 +697,14 @@ public class DataSetTableService { ...@@ -695,13 +697,14 @@ public class DataSetTableService {
for (int j = 0; j < row.getPhysicalNumberOfCells(); j++) { for (int j = 0; j < row.getPhysicalNumberOfCells(); j++) {
if (i == 0) { if (i == 0) {
TableFiled tableFiled = new TableFiled(); TableFiled tableFiled = new TableFiled();
tableFiled.setFieldName(readCell(row.getCell(j)));
tableFiled.setRemarks(readCell(row.getCell(j)));
tableFiled.setFieldType("TEXT"); tableFiled.setFieldType("TEXT");
tableFiled.setFieldSize(1024); tableFiled.setFieldSize(1024);
if(StringUtils.isEmpty(tableFiled.getFieldName())){ String columnName = readCell(row.getCell(j));
continue; if(StringUtils.isEmpty(columnName)){
columnName = "NONE_" + String.valueOf(j);
} }
tableFiled.setFieldName(columnName);
tableFiled.setRemarks(columnName);
fields.add(tableFiled); fields.add(tableFiled);
} else { } else {
r[j] = readCell(row.getCell(j)); r[j] = readCell(row.getCell(j));
......
...@@ -67,7 +67,6 @@ Vue.use(message) ...@@ -67,7 +67,6 @@ Vue.use(message)
Vue.config.productionTip = false Vue.config.productionTip = false
Vue.prototype.hasDataPermission = function(pTarget, pSource) { Vue.prototype.hasDataPermission = function(pTarget, pSource) {
debugger
if (pSource && pTarget) { if (pSource && pTarget) {
return pSource.indexOf(pTarget) > -1 return pSource.indexOf(pTarget) > -1
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论