|
@@ -244,7 +244,7 @@ public class EmployeeInfoServiceImpl implements EmployeeInfoService {
|
|
|
}
|
|
|
updateReqVO.setPosition(post.getName());
|
|
|
}
|
|
|
- if (updateReqVO.getBaseAnnualLeave() != null) {
|
|
|
+ if (updateReqVO.getRemainingAnnualLeave() == null && updateReqVO.getUsedAnnualLeave() == null) {
|
|
|
updateReqVO.setRemainingAnnualLeave(updateReqVO.getBaseAnnualLeave().subtract(employeeInfoDO.getUsedAnnualLeave()));
|
|
|
}
|
|
|
EmployeeInfoDO updateObj = BeanUtils.toBean(updateReqVO, EmployeeInfoDO.class);
|