Merge branch 'lal' into 'develop'

提交

See merge request 8timerv2/8timerapiv200!483

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

@@ -3921,7 +3921,9 @@ public class ClockInController {
 											xxts =	ClockInTool.doChinFilters(ClockInTool.deleteArrayNull(xxts), num);//为必须上班的话从休息日期中去除
 										}
 										if(Arrays.binarySearch(appmaps, num) >= 0) {//检查是否存在 无需打卡名单中
-											ycqts = ClockInTool.doChinFilters(ClockInTool.deleteArrayNull(ycqts), num);//为必须休息的话从上班日期中去除
+											if(ClockInTool.doChinFilters(ClockInTool.deleteArrayNull(ycqts), num) != null) {
+												ycqts = ClockInTool.doChinFilters(ClockInTool.deleteArrayNull(ycqts), num);//为必须休息的话从上班日期中去除
+											}
 											String[] xxtst = new String[xxts.length + zj];
 											System.arraycopy(xxts, 0, xxtst, 0, xxts.length);
 											xxtst[x] = num;