优化修改

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

@@ -4082,22 +4082,22 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 							UpProjectSocialFundVo vo = new UpProjectSocialFundVo();
 							// 社保状态 社保状态（字典）: 0 无社保 1 处理中 2.部分购买 3.正常 4.已派减
 							initSocialFundStatus(socialInfo, providentFund, vo,sf);
+							vo.setEmpIdCard(dis.getEmpIdcard());
+							vo.setDepartNo(dis.getSettleDomainCode());
 							if (Common.isNotNull(dis.getChangeContractAndEmployee())
 									&& CommonConstants.ZERO_STRING.equals(dis.getChangeContractAndEmployee())
 							&& (Common.isNotNull(vo.getSocialStatus()) || Common.isNotNull(vo.getFundStatus()))) {
-								vo.setEmpIdCard(dis.getEmpIdcard());
-								vo.setDepartNo(dis.getSettleDomainCode());
 								vo.setChangeContractAndEmployee(dis.getChangeContractAndEmployee());
 								vo.setUserId(user.getId());
 								vo.setUserName(user.getNickname());
 								vo.setEmpName(dis.getEmpName());
 								vo.setDeptName(dis.getSettleDomainName());
 								vo.setDetailId(dis.getId());
-								R<Boolean> resUp = archivesDaprUtil.updateProjectSocialFund(vo);
-								if (Common.isEmpty(resUp) || !(CommonConstants.SUCCESS.intValue() == resUp.getCode()) || !resUp.getData().booleanValue()) {
-									errorList.add(new ErrorMessage(-1, vo.getEmpIdCard() + DispatchConstants.DISPATCH_SYN_DOC_EXE, CommonConstants.RED, dis.getEmpName()));
-									continue;
-								}
+							}
+							R<Boolean> resUp = archivesDaprUtil.updateProjectSocialFund(vo);
+							if (Common.isEmpty(resUp) || !(CommonConstants.SUCCESS.intValue() == resUp.getCode()) || !resUp.getData().booleanValue()) {
+								errorList.add(new ErrorMessage(-1, vo.getEmpIdCard() + DispatchConstants.DISPATCH_SYN_DOC_EXE, CommonConstants.RED, dis.getEmpName()));
+								continue;
 							}
 							// 派减公积金办理失败不同步档案的相关字段信息
 						} else if (!(CommonConstants.ONE_STRING.equals(dis.getType())