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

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

@@ -501,7 +501,8 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
 					if (projectList != null && !projectList.isEmpty()) {
 						errorMsg.add(MsgUtils.getMessage(ErrorCodes.ARCHIVES_IMPORT_EMP_HAVE_PROJECT, employee.getEmpIdcard()));
 					} else {
-						oldEmployee = existEmpMap.get(excel.getEmpIdcard());
+						oldEmployee = new TEmployeeInfo();
+						BeanUtil.copyProperties(employee, oldEmployee);
 						// 开始减档
 						employee.setFileStatus(CommonConstants.ONE_INT);
 						employee.setLeaveUser(user.getId());