|
@@ -3607,7 +3607,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
|
|
|
BigDecimal leaveDays=new BigDecimal(0);
|
|
|
BigDecimal leaveTimes=new BigDecimal(0);
|
|
|
for (LeaveSheet leaveSheet : leaveSheets) {
|
|
|
- leaveDays=leaveDays.add(new BigDecimal(leaveSheet.getTimeDays()));
|
|
|
+ leaveDays=leaveDays.add(new BigDecimal(leaveSheet.getTimeDays()==null?0:leaveSheet.getTimeDays()));
|
|
|
leaveTimes=leaveTimes.add(new BigDecimal(leaveSheet.getTimeHours()));
|
|
|
}
|
|
|
user.put("leaveType",leaveType);
|