Merge branch 'lal' into 'develop'

提交

See merge request 8timerv2/8timerapiv200!311

src/main/java/cn/timer/api/controller/kqgl/ClockInController.java

@@ -572,9 +572,13 @@ public class ClockInController {
 															 if((atttype)%2 > 0){//上班
 															 if((atttype)%2 > 0){//上班
 																if(timeyes > 0){
 																if(timeyes > 0){
 																	sbdkjg = Integer.valueOf(timeyes.toString());
 																	sbdkjg = Integer.valueOf(timeyes.toString());
+																}else {
+																	sbdkjg = 0;
 																}
 																}
 															 }else{//下班
 															 }else{//下班
-																if(timeyes > 0){}else{
+																if(timeyes > 0){
+																	sbdkjg = 0;
+																}else{
 																	sbdkjg = Math.abs(Integer.valueOf(timeyes.toString()));
 																	sbdkjg = Math.abs(Integer.valueOf(timeyes.toString()));
 																}
 																}
 															 }
 															 }