Commit c04a776a authored by hongguangwu's avatar hongguangwu

Merge branch 'develop'

parents 5fa25176 e7b24ac1
......@@ -218,13 +218,7 @@ public class TSalaryStandardOriginalServiceImpl extends ServiceImpl<TSalaryStand
dataRow = 0;
dataRowFlag = true;
idCardNullNum = 0;
// 循环当前sheet的每行内容
if (Common.isNotNull(maxColumn)) {
rowLastCellNum = maxColumn;
} else {
rowLastCellNum = sheetAt.getLastRowNum();
}
for (int rowNum = 0; rowNum <= rowLastCellNum; rowNum++) {
for (int rowNum = 0; rowNum <= sheetAt.getLastRowNum(); rowNum++) {
nullColumn = -1;
preNullColumn = -1;
......@@ -236,7 +230,13 @@ public class TSalaryStandardOriginalServiceImpl extends ServiceImpl<TSalaryStand
columnList = new ArrayList<>();
row = sheetAt.getRow(rowNum);
if (row != null) {
for (int cellNum = 0; cellNum < row.getLastCellNum(); cellNum++) {
// 循环当前sheet的每行内容
if (Common.isNotNull(maxColumn)) {
rowLastCellNum = maxColumn;
} else {
rowLastCellNum = row.getLastCellNum();
}
for (int cellNum = 0; cellNum < rowLastCellNum; cellNum++) {
columnVo = new ExcelColumnVo();
try {
cell = row.getCell(cellNum);
......
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