|
@@ -442,7 +442,7 @@ public class WorkScheduleAttendanceServiceImpl implements WorkScheduleAttendance
|
|
//说明下班后被安排了加班
|
|
//说明下班后被安排了加班
|
|
workOver = workOverService.get(workOverPerson.getWorkOverId());
|
|
workOver = workOverService.get(workOverPerson.getWorkOverId());
|
|
|
|
|
|
- if(workOver!=null && "1".equals(workOver.getStatus()) && workOver.getHours()!=null) {
|
|
|
|
|
|
+ if(workOver!=null && workOver.getHours()!=null) {
|
|
endTime = endTime.plusHours(workOver.getHours());
|
|
endTime = endTime.plusHours(workOver.getHours());
|
|
}
|
|
}
|
|
}
|
|
}
|