Skip to content

Y
yifu-mvp
Commit 3b8bb977 authored by fangxinjiang's avatar fangxinjiang
Browse files
Options

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

parents 4d1ea3da c5dc81e6
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
View file @ 3b8bb977
...@@ -501,7 +501,8 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T ...@@ -501,7 +501,8 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
if (projectList != null && !projectList.isEmpty()) { if (projectList != null && !projectList.isEmpty()) {
errorMsg.add(MsgUtils.getMessage(ErrorCodes.ARCHIVES_IMPORT_EMP_HAVE_PROJECT, employee.getEmpIdcard())); errorMsg.add(MsgUtils.getMessage(ErrorCodes.ARCHIVES_IMPORT_EMP_HAVE_PROJECT, employee.getEmpIdcard()));
} else { } else {
oldEmployee = existEmpMap.get(excel.getEmpIdcard()); oldEmployee = new TEmployeeInfo();
BeanUtil.copyProperties(employee, oldEmployee);
// 开始减档 // 开始减档
employee.setFileStatus(CommonConstants.ONE_INT); employee.setFileStatus(CommonConstants.ONE_INT);
employee.setLeaveUser(user.getId()); employee.setLeaveUser(user.getId());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment