Merge branch 'lal' into 'develop'

提交 See merge request 8timerv2/8timerapiv200!484

Merge branch 'lal' into 'develop'
提交 See merge request 8timerv2/8timerapiv200!484
bc4086c7 · leialin · d40882ec · 7d331d22 · bc4086c7
Commit bc4086c7 authored 4 years ago by leialin
Hide whitespace changes
Inline Side-by-side

Showing with 1 additions and 1 deletions

src/main/java/cn/timer/api/controller/kqgl/ClockInController.java
+1 -1

No files found.
--- a/src/main/java/cn/timer/api/controller/kqgl/ClockInController.java
+++ b/src/main/java/cn/timer/api/controller/kqgl/ClockInController.java
@@ -1970,7 +1970,7 @@ public class ClockInController {
 											 
 											 //班次的休息时间
 											 long rest_time = 0;
-											 if(shif.getStartTime() != null && shif.getEndTime() != null) {
+											 if(shif.getStartTime() != null && !("").equals(shif.getStartTime()) && shif.getEndTime() != null && !("").equals(shif.getEndTime())) {
 												 long kaishixiuxi = Long.valueOf(ClockInTool.dateToStamp(putime + " " +shif.getStartTime()+":00"));
 											     long jieshuxiuxi = Long.valueOf(ClockInTool.dateToStamp(putime + " " +shif.getEndTime()+":00"));
 											     rest_time = (jieshuxiuxi - kaishixiuxi)/1000/60;//休息时间