Merge remote-tracking branch 'origin/MVP1.5.1' into MVP1.5.1

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/util/SalaryAccountUtil.java

@@ -457,6 +457,7 @@ public class SalaryAccountUtil implements Serializable {
 				TSalaryEmployee otherEmp;
 				List<TSalaryEmployee> saveNewEmpList = new ArrayList<>();
 				List<String> checkTaxMonthList = new ArrayList<>();
+				boolean isContinue = true;
 				if (!newEmpList.isEmpty()) {
 					TSalaryEmployee newEmps;
 					for (int i = 0; i < newEmpList.size(); i++) {
@@ -489,10 +490,13 @@ public class SalaryAccountUtil implements Serializable {
 									, CommonConstants.ZERO_STRING.equals(entity.getSalaryGiveTime())
 									, CommonConstants.ONE_STRING.equals(entity.getIsNewEmployee())
 									, otherEmp.getEmpName(), entity.getSalaryStyle()
-									, nowMonth, updateEmpList, checkBankInfoEmpList, newEmps.getLineNums())) return;
+									, nowMonth, updateEmpList, checkBankInfoEmpList, newEmps.getLineNums())) {
+								isContinue = false;
 							}
 						}
 					}
+				}
+				if (isContinue) {
 					int nowYear = Integer.parseInt(nowMonth.substring(0, 4));
 					Map<String, String> minTaxMonthMap = tSalaryAccountService.getMinTaxMonthByNowYearAndList(checkTaxMonthList, nowYear);
 					String minTaxMonth;
@@ -519,6 +523,7 @@ public class SalaryAccountUtil implements Serializable {
 						tSalaryEmployeeService.saveNewEmployeeList(saveNewEmpList, errorList);
 					}
 				}
+			}
 		} catch (Exception e) {
 			e.printStackTrace();
 			log.error("将jsonString数据源的数据导入到list异常!");