Merge branch 'lal' into 'develop'

提交

See merge request 8timerv2/8timerapiv200!485

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

@@ -3144,12 +3144,13 @@ public class ClockInController {
 								 .eq(KqglAssoDkjl::getUserId, userBean.getEmpNum()).ge(KqglAssoDkjl::getDktime, startDate).le(KqglAssoDkjl::getDktime, endDate)
 								 .ne(KqglAssoDkjl::getSort, 0).ne(KqglAssoDkjl::getStatus, 2).ne(KqglAssoDkjl::getStatus, 0)
 								 .orderByDesc(KqglAssoDkjl::getSort).last("LIMIT 1"));
-						 
-						 AttSchedule att = attsch.get(dk.getSort()-1);
-						 att.setIsupdate(1);
-						 
-						 AttSchedule attw = attsch.get(dk.getSort()-2);
-						 attw.setIsupdate(0);
+						 if(dk != null) {
+							 AttSchedule att = attsch.get(dk.getSort()-1);
+							 att.setIsupdate(1);
+							 
+							 AttSchedule attw = attsch.get(dk.getSort()-2);
+							 attw.setIsupdate(0);
+						 }
 					 }
 					 
 					 //全部为缺卡时 没有打卡按钮显示