Merge remote-tracking branch 'origin/develop' into develop

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

@@ -3321,6 +3321,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 							// 同步预估库数据
 							forecastLibraryService.updateForecastLibaryByDispatchReduce(sf, forecastFlag);
 						}
+						// 派减办理失败不同步档案的相关字段信息
+						if (!(CommonConstants.ONE_STRING.equals(dis.getType()) && CommonConstants.ONE_INT == flag)){
 							UpProjectSocialFundVo vo = new UpProjectSocialFundVo();
 							// 社保状态 社保状态（字典）: 0 无社保 1 处理中 2.部分购买 3.正常 4.已派减
 							initSocialFundStatus(socialInfo, providentFund, vo,sf);
@@ -3330,6 +3332,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 							if (Common.isEmpty(resUp) || !(CommonConstants.SUCCESS.intValue() == resUp.getCode()) || !resUp.getData().booleanValue()){
 								ServiceUtil.runTimeExceptionDiy("同步人员档案、项目档案的社保公积金状态失败！");
 							}
+						}
 					} else {
 						errorList.add(new ErrorMessage(-1, "派单数据错误！"));
 					}