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

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

@@ -296,7 +296,10 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
 			// 初始化
 			tEmployeeContractInfo.setUpdateBy(user.getId());
 			tEmployeeContractInfo.setUpdateTime(LocalDateTime.now());
-
+			if (CommonConstants.TWO_STRING.equals(tEmployeeContractInfo.getContractType())
+					|| CommonConstants.ZERO_STRING.equals(tEmployeeContractInfo.getContractType())) {
+				tEmployeeContractInfo.setContractEnd(null);
+			}
 			//是否归档：否
 			tEmployeeContractInfo.setIsFile(CommonConstants.ONE_STRING);
 			//是否在用：否
@@ -1148,7 +1151,8 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
 								)
 								.last(CommonConstants.LAST_ONE_SQL));
 						if (contractInfo != null) {
-							errorInfo.append("该员工已存在相同起始日期的合同，禁止重复添加！");
+							errorMessageList.add(new ErrorMessage(excel.getRowIndex(), "该员工已存在相同起始日期的合同，禁止重复添加！"));
+                           return;
 
 						}
 					}
@@ -1165,8 +1169,8 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
 							)
 							.last(CommonConstants.LAST_ONE_SQL));
 					if (contractInfo != null) {
-
-						errorInfo.append("该员工已存在相同起始和截止日期的合同，禁止重复添加");
+						errorMessageList.add(new ErrorMessage(excel.getRowIndex(), "该员工已存在相同起始和截止日期的合同，禁止重复添加"));
+                       return;
 					}
 
 				}