Merge branch 'lal' into 'develop'

提交

See merge request 8timerv2/8timerapiv200!405

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

@@ -2595,6 +2595,7 @@ public class ClockInController {
 						 List<AttSchedule> beforeattsch = beforeattdate.getAttsch();
 						 List<AttSchedule> beforeattsch = beforeattdate.getAttsch();
 						 
 						 
 						 int p = 0;
 						 int p = 0;
+						 if(EmptyUtil.isNotEmpty(beforeattdate.getAttsch()) && beforeattsch.get(0).getId() != 0) {
 							 for(AttSchedule befo : beforeattsch) {
 							 for(AttSchedule befo : beforeattsch) {
 								 boolean isdkjl = true;
 								 boolean isdkjl = true;
 								 if(befo.getNextday() == 1) {
 								 if(befo.getNextday() == 1) {
@@ -2651,6 +2652,8 @@ public class ClockInController {
 								 }
 								 }
 							 }
 							 }
 						 }
 						 }
+						 
+					 }
 					 /****************次日结束***************/
 					 /****************次日结束***************/
 					 
 					 
 					 int bccs = attdate.getAttsch().size();
 					 int bccs = attdate.getAttsch().size();