Merge branch 'develop' into feature-zhaji

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/constants/PreDispatchConstants.java

@@ -45,5 +45,4 @@ public class PreDispatchConstants {
     public static final String NO_SOCIAL_FUND_ADDRESS_REDUCE = "派减：养老城市和公积金城市不可同时为空，请确认表中有‘养老城市’和‘公积金城市’数据列及数据！";
 	public static final String GET_AREA_INFO = "获取区域数据失败！";
 	public static final String TEL_NOT_EMPTY = "联系电话2不可为空！";
-	public static final String TEL_INVALID = "联系电话2无效！";
 }

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

@@ -552,9 +552,6 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
 			if (Common.isEmpty(tPreDispatchInfo.getTelTwo())){
 				return R.failed(PreDispatchConstants.TEL_NOT_EMPTY);
 			}
-			if (ValidityUtil.checkInvalidEmpPhone(tPreDispatchInfo.getTelTwo())){
-				return R.failed(PreDispatchConstants.TEL_INVALID);
-			}
 		}
 		if (CommonConstants.ONE_STRING.equals(tPreDispatchInfo.getType())) {
 			initLeaveReason(tPreDispatchInfo);
@@ -600,8 +597,8 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
 		int i = 1;
 		for (TPreDispatchInfo info : listInfo) {
 			i++;
-			if (!CommonConstants.IS_TRUE.equals(info.getTelNotice()) &&
-					!CommonConstants.IS_FALSE.equals(info.getTelNotice())) {
+			if (Common.isNotNull(info.getTelNotice()) && (!CommonConstants.IS_TRUE.equals(info.getTelNotice()) &&
+					!CommonConstants.IS_FALSE.equals(info.getTelNotice()))) {
 				errorList.add(new ErrorMessage(i,"是否电话通知不允许导入【是】和【否】之外的内容"));
 				continue;
 			}
@@ -749,8 +746,8 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
 		String str = null;
 		for (TPreDispatchInfo info:listInfo){
 			i++;
-			if (!CommonConstants.IS_TRUE.equals(info.getTelNotice()) &&
-					!CommonConstants.IS_FALSE.equals(info.getTelNotice())) {
+			if (Common.isNotNull(info.getTelNotice()) && (!CommonConstants.IS_TRUE.equals(info.getTelNotice()) &&
+					!CommonConstants.IS_FALSE.equals(info.getTelNotice()))) {
 				errorList.add(new ErrorMessage(i,"是否电话通知不允许导入【是】和【否】之外的内容"));
 				continue;
 			}
@@ -857,7 +854,7 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
 		TPreDispatchInfo preInfo = new TPreDispatchInfo();
 		if (Common.isNotNull(list)){
 			for (TPreDispatchReduceVo info:list){
-				BeanUtils.copyProperties(preInfo,info);
+				BeanUtils.copyProperties(info,preInfo);
 				listInfo.add(preInfo);
 			}
 		}
@@ -1174,9 +1171,6 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
 			if (Common.isEmpty(tPreDispatchInfo.getTelTwo())){
 				return PreDispatchConstants.TEL_NOT_EMPTY;
 			}
-			if (ValidityUtil.checkInvalidEmpPhone(tPreDispatchInfo.getTelTwo())){
-				return PreDispatchConstants.TEL_INVALID;
-			}
 			if (Common.isEmpty(tPreDispatchInfo.getPensionAddress()) &&
 					Common.isEmpty(tPreDispatchInfo.getFundAddress())) {
 				return PreDispatchConstants.NO_SOCIAL_FUND_ADDRESS_ADD;