Commit 51cbc4ab authored by hongguangwu's avatar hongguangwu

MVP1.6.3 特殊导入-优化

parent ba4a6e7e
...@@ -392,6 +392,9 @@ public class TSalaryStandardOriginalServiceImpl extends ServiceImpl<TSalaryStand ...@@ -392,6 +392,9 @@ public class TSalaryStandardOriginalServiceImpl extends ServiceImpl<TSalaryStand
} }
} }
if (dataRowFlag) { if (dataRowFlag) {
if (idCardNum != -1) {
return R.failed("您配置的身份证列第【"+(idCardNum+1)+"】列未找到身份证,请确认表头配置或表格数据!!");
}
return R.failed("未找到身份证所在的数据行,请检查表数据!!"); return R.failed("未找到身份证所在的数据行,请检查表数据!!");
} }
sheetVo.setDataNum(dataRow); sheetVo.setDataNum(dataRow);
...@@ -669,6 +672,9 @@ public class TSalaryStandardOriginalServiceImpl extends ServiceImpl<TSalaryStand ...@@ -669,6 +672,9 @@ public class TSalaryStandardOriginalServiceImpl extends ServiceImpl<TSalaryStand
} }
} }
if (dataRowFlag) { if (dataRowFlag) {
if (idCardNum != -1) {
return R.failed("您配置的身份证列第【"+(idCardNum+1)+"】列未找到身份证,请确认表头配置或表格数据!!");
}
return R.failed("未找到身份证所在的数据行,请检查表数据!!"); return R.failed("未找到身份证所在的数据行,请检查表数据!!");
} }
sheetVo.setDataNum(dataRow); sheetVo.setDataNum(dataRow);
......
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