1.5.4-社保派单合同日期拦截优化

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java

@@ -2253,15 +2253,17 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 			if (Common.isEmpty(empVo.getContractName()) && validContractInfo(errorMessageList,excel)) {
 				return true;
 			}
-			if (Common.isNotNull(empVo.getContractStart()) && Common.isNotNull(excel.getContractStart())) {
+			if (Common.isNotNull(empVo.getContractStart())) {
 				// 系统已存在的合同起缴日期
-				String conYearMonthDay = DateUtil.formatDatePatten(empVo.getContractStart(),DateUtil.ISO_EXPANDED_DATE_FORMAT);
-				String excelConYearMonthDay = DateUtil.formatDatePatten(excel.getContractStart(),DateUtil.ISO_EXPANDED_DATE_FORMAT);
+				if (Common.isNotNull(excel.getContractStart())) {
+					String conYearMonthDay = DateUtil.formatDatePatten(empVo.getContractStart(), DateUtil.ISO_EXPANDED_DATE_FORMAT);
+					String excelConYearMonthDay = DateUtil.formatDatePatten(excel.getContractStart(), DateUtil.ISO_EXPANDED_DATE_FORMAT);
 					if (!conYearMonthDay.equals(excelConYearMonthDay)) {
 						errorMessageList.add(new ErrorMessage(excel.getRowIndex(), "系统内[合同]起缴日期年月日【"
 								+ conYearMonthDay + "】与派单[合同]日期的年月日【" + excelConYearMonthDay + "】不一致！禁止派单！"));
 						return true;
 					}
+				}
 				String conYearMonth = DateUtil.formatDatePatten(empVo.getContractStart(),DateUtil.DATETIME_YYYYMM);
 				if (Common.isEmpty(excel.getTrustRemark())) {
 					if (judgeConStartAndSocialFund(errorMessageList, excel, conYearMonth, excel.getPensionStart(), "养老")) { return true;}