Commit a0f7a3ff authored by hongguangwu's avatar hongguangwu

MVP1.7.0 优化

parent 5bb51b1b
...@@ -3113,7 +3113,8 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -3113,7 +3113,8 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
List<String> idCardList = new ArrayList<>(); List<String> idCardList = new ArrayList<>();
for (PreUploadEmpImportVo info : excelList) { for (PreUploadEmpImportVo info : excelList) {
errorCheck = new StringBuilder(); errorCheck = new StringBuilder();
if (Common.isNotNull(info.getIsMain()) && Boolean.TRUE.equals(info.getIsMain())) { if (Common.isNotNull(info.getIsMain())) {
if (Boolean.TRUE.equals(info.getIsMain())) {
if (Common.isNotNull(info.getEmpName())) { if (Common.isNotNull(info.getEmpName())) {
if (idCardFlag == 0) { if (idCardFlag == 0) {
if (Common.isNotNull(info.getEmpIdcard())) { if (Common.isNotNull(info.getEmpIdcard())) {
...@@ -3186,6 +3187,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -3186,6 +3187,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
} }
} }
} }
}
if (errorCheck.length() > 0) { if (errorCheck.length() > 0) {
info.setErrorInfo(info.getErrorInfo() + "校验未通过:" + errorCheck); info.setErrorInfo(info.getErrorInfo() + "校验未通过:" + errorCheck);
errorList.add(info); errorList.add(info);
......
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