Merge branch 'lal' into 'develop'

提交

See merge request 8timerv2/8timerapiv200!412

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

@@ -2858,12 +2858,18 @@ public class ClockInController {
 							 if(ash.getIsdk() == 1 && b.after(tt) && dkjl.getDktime() == null && dkjl.getId() == null && dkcs > 0 && iscrdk) {
 								 dkjl.setStatus(17);//缺卡
 								 dkjl.setSort(ash.getSort());
-								 dkjl.setId(8881);
+								 dkjl.setId(888);
 								 //更新打卡关闭
 								 ash.setIsupdate(0);
 								 ash.setIsdk(1);
+							 }else if(ash.getIsdk() == 1 && b.after(tt) && dkjl.getDktime() == null && dkjl.getId() == null){
+								 dkjl.setStatus(17);//缺卡
+								 dkjl.setSort(ash.getSort());
+								 dkjl.setId(888);
 							 }
 							 
+							 
+							 
 							 /****/
 								//事务(请假，加班，调休，出差)
 		 		    			KqglAssoRelationSummary asssum1 = KqglAssoRelationSummary.builder().build().selectOne(new QueryWrapper<KqglAssoRelationSummary>().lambda().eq(KqglAssoRelationSummary::getUserId, userBean.getEmpNum())