|
|
@ -390,9 +390,6 @@ public class ModulexServiceImpl extends ServiceImpl<ModulexMapper, Modulex> impl |
|
|
|
if (j == 2) { |
|
|
|
if (j == 2) { |
|
|
|
for (int k = 0; k < physicalNumberOfCells; k++) { |
|
|
|
for (int k = 0; k < physicalNumberOfCells; k++) { |
|
|
|
Cell cell = row.getCell(k); |
|
|
|
Cell cell = row.getCell(k); |
|
|
|
if(cell==null){ |
|
|
|
|
|
|
|
propertyNames.add(null); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
String name = cell.getStringCellValue(); |
|
|
|
String name = cell.getStringCellValue(); |
|
|
|
propertyNames.add(name); |
|
|
|
propertyNames.add(name); |
|
|
|
} |
|
|
|
} |
|
|
@ -430,7 +427,7 @@ public class ModulexServiceImpl extends ServiceImpl<ModulexMapper, Modulex> impl |
|
|
|
Cell cell = row.getCell(k); |
|
|
|
Cell cell = row.getCell(k); |
|
|
|
if(cell==null){ |
|
|
|
if(cell==null){ |
|
|
|
message.put("isError", "true"); |
|
|
|
message.put("isError", "true"); |
|
|
|
message.put("status","表格中有空白单元格,"+"请重新导入"); |
|
|
|
message.put("status","表格中有空白行,"+"请重新导入"); |
|
|
|
message.put("closeable","true"); |
|
|
|
message.put("closeable","true"); |
|
|
|
webSocketUtils.sendMessage(loginUser.getId(), message); |
|
|
|
webSocketUtils.sendMessage(loginUser.getId(), message); |
|
|
|
return Result.error("数据匹配读取失败,"+"请重新导入"); |
|
|
|
return Result.error("数据匹配读取失败,"+"请重新导入"); |
|
|
|