MVP1.7.0 优化

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java

@@ -3113,76 +3113,78 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
 			List<String> idCardList = new ArrayList<>();
 			for (PreUploadEmpImportVo info : excelList) {
 				errorCheck = new StringBuilder();
-				if (Common.isNotNull(info.getIsMain()) && Boolean.TRUE.equals(info.getIsMain())) {
-					if (Common.isNotNull(info.getEmpName())) {
-						if (idCardFlag == 0) {
-							if (Common.isNotNull(info.getEmpIdcard())) {
-								resultB = idCardMap.get(info.getEmpIdcard() + CommonConstants.DOWN_LINE_STRING + info.getEmpName());
+				if (Common.isNotNull(info.getIsMain())) {
+					if (Boolean.TRUE.equals(info.getIsMain())) {
+						if (Common.isNotNull(info.getEmpName())) {
+							if (idCardFlag == 0) {
+								if (Common.isNotNull(info.getEmpIdcard())) {
+									resultB = idCardMap.get(info.getEmpIdcard() + CommonConstants.DOWN_LINE_STRING + info.getEmpName());
+									if (resultB != null) {
+										if (Boolean.FALSE.equals(resultB)) {
+											errorCheck.append("姓名&身份证号不一致;");
+										}
+									} else {
+										errorCheck.append("姓名&身份证号未校验;");
+									}
+								}
+							} else if (idCardFlag == 2) {
+								errorCheck.append("姓名&身份证号不一致；");
+							}
+							if (Common.isNotNull(info.getBankNo())) {
+								resultB = bankNoMap.get(info.getBankNo() + CommonConstants.DOWN_LINE_STRING + info.getEmpName());
 								if (resultB != null) {
 									if (Boolean.FALSE.equals(resultB)) {
-										errorCheck.append("姓名&身份证号不一致;");
+										errorCheck.append("姓名&银行卡号不一致;");
 									}
 								} else {
-									errorCheck.append("姓名&身份证号未校验;");
+									errorCheck.append("姓名&银行卡号未校验;");
 								}
 							}
-						} else if (idCardFlag == 2) {
-							errorCheck.append("姓名&身份证号不一致；");
 						}
-						if (Common.isNotNull(info.getBankNo())) {
-							resultB = bankNoMap.get(info.getBankNo() + CommonConstants.DOWN_LINE_STRING + info.getEmpName());
+						// 手机号码
+						if (Common.isNotNull(info.getEmpPhone())) {
+							resultB = phoneMap.get(info.getEmpPhone());
 							if (resultB != null) {
 								if (Boolean.FALSE.equals(resultB)) {
-									errorCheck.append("姓名&银行卡号不一致;");
+									errorCheck.append("手机号码校验不通过;");
 								}
 							} else {
-								errorCheck.append("姓名&银行卡号未校验;");
+								errorCheck.append("手机号码未校验;");
 							}
 						}
-					}
-					// 手机号码
-					if (Common.isNotNull(info.getEmpPhone())) {
-						resultB = phoneMap.get(info.getEmpPhone());
-						if (resultB != null) {
-							if (Boolean.FALSE.equals(resultB)) {
-								errorCheck.append("手机号码校验不通过;");
-							}
-						} else {
-							errorCheck.append("手机号码未校验;");
-						}
-					}
-					// 手机号码（紧急联系人）
-					if (Common.isNotNull(info.getTel())) {
-						resultB = phoneMap.get(info.getTel());
-						if (resultB != null) {
-							if (Boolean.FALSE.equals(resultB)) {
-								errorCheck.append("手机号码（紧急联系人）校验不通过;");
+						// 手机号码（紧急联系人）
+						if (Common.isNotNull(info.getTel())) {
+							resultB = phoneMap.get(info.getTel());
+							if (resultB != null) {
+								if (Boolean.FALSE.equals(resultB)) {
+									errorCheck.append("手机号码（紧急联系人）校验不通过;");
+								}
+							} else {
+								errorCheck.append("手机号码（紧急联系人）未校验;");
 							}
-						} else {
-							errorCheck.append("手机号码（紧急联系人）未校验;");
 						}
-					}
-					// 手机号码（家庭成员）
-					if (Common.isNotNull(info.getContractTel())) {
-						resultB = phoneMap.get(info.getContractTel());
-						if (resultB != null) {
-							if (Boolean.FALSE.equals(resultB)) {
-								errorCheck.append("手机号码（家庭成员）校验不通过;");
+						// 手机号码（家庭成员）
+						if (Common.isNotNull(info.getContractTel())) {
+							resultB = phoneMap.get(info.getContractTel());
+							if (resultB != null) {
+								if (Boolean.FALSE.equals(resultB)) {
+									errorCheck.append("手机号码（家庭成员）校验不通过;");
+								}
+							} else {
+								errorCheck.append("手机号码（家庭成员）未校验;");
 							}
-						} else {
-							errorCheck.append("手机号码（家庭成员）未校验;");
 						}
-					}
-				} else {
-					// 手机号码（家庭成员）
-					if (Common.isNotNull(info.getContractTel())) {
-						resultB = phoneMap.get(info.getContractTel());
-						if (resultB != null) {
-							if (Boolean.FALSE.equals(resultB)) {
-								errorCheck.append("手机号码（家庭成员）校验不通过;");
+					} else {
+						// 手机号码（家庭成员）
+						if (Common.isNotNull(info.getContractTel())) {
+							resultB = phoneMap.get(info.getContractTel());
+							if (resultB != null) {
+								if (Boolean.FALSE.equals(resultB)) {
+									errorCheck.append("手机号码（家庭成员）校验不通过;");
+								}
+							} else {
+								errorCheck.append("手机号码（家庭成员）未校验;");
 							}
-						} else {
-							errorCheck.append("手机号码（家庭成员）未校验;");
 						}
 					}
 				}