diff --git a/evo-admin/src/main/java/com/evo/system/service/impl/SysStaffServiceImpl.java b/evo-admin/src/main/java/com/evo/system/service/impl/SysStaffServiceImpl.java index 69c447f..c870f96 100644 --- a/evo-admin/src/main/java/com/evo/system/service/impl/SysStaffServiceImpl.java +++ b/evo-admin/src/main/java/com/evo/system/service/impl/SysStaffServiceImpl.java @@ -373,6 +373,8 @@ public class SysStaffServiceImpl extends ServiceImpl i if(StringUtils.isNotNull(sysStaff.getQuitDate())){ //离职时间小于当前,说明离职了 if(sysStaff.getQuitDate().getTime() < DateUtils.getNowDate().getTime()){ + //记录原始状态 + String oldStatus = sysStaff.getStatus(); sysStaff.setStatus("-1"); int i = getBaseMapper().updateSysStaff(sysStaff); if(i < 1){ @@ -384,6 +386,8 @@ public class SysStaffServiceImpl extends ServiceImpl i } //如果走离职, 需要实时计算出工资 + //还原原始状态, 用于计算离职工资 + sysStaff.setStatus(oldStatus); rzSalaryDetailService.dimission(sysStaff); return AjaxResult.success(); }