Merge branch 'develop' into 'master'

Develop

See merge request 8timerv2/8timerapiv200!472

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

@@ -3927,27 +3927,29 @@ public class ClockInController {
 						}
 						}
 		    		}
 		    		}
 					
 					
-					
-		    		for(String nus : nextrange) {
-		    			WorkbenchCalendarDto wocal = WorkbenchCalendarDto.builder().build();
-		    	    	wocal.setDate(nus);
-		    	    	if(pbfs == 3) {
-		    	    		wocal.setCalendar_status(0);//
-		    	    		wocal.setCalendar_status_type(0);
-		    	    	}else {
-		    	    		if(ClockInTool.contains(ClockInTool.deleteArrayNull(ycqts),nus)) {
-			    	    		wocal.setCalendar_status(1);//
-			    	    		wocal.setCalendar_status_type(0);
-			    	    	}
-			    	    	if(ClockInTool.contains(ClockInTool.deleteArrayNull(xxts),nus)) {
-			    	    		wocal.setCalendar_status(4);//
+		    		if(!(nextrange[0]).equals("")) {
+		    			for(String nus : nextrange) {
+			    			WorkbenchCalendarDto wocal = WorkbenchCalendarDto.builder().build();
+			    	    	wocal.setDate(nus);
+			    	    	if(pbfs == 3) {
+			    	    		wocal.setCalendar_status(0);//
 			    	    		wocal.setCalendar_status_type(0);
 			    	    		wocal.setCalendar_status_type(0);
+			    	    	}else {
+			    	    		if(ClockInTool.contains(ClockInTool.deleteArrayNull(ycqts),nus)) {
+				    	    		wocal.setCalendar_status(1);//
+				    	    		wocal.setCalendar_status_type(0);
+				    	    	}
+				    	    	if(ClockInTool.contains(ClockInTool.deleteArrayNull(xxts),nus)) {
+				    	    		wocal.setCalendar_status(4);//
+				    	    		wocal.setCalendar_status_type(0);
+				    	    	}
 			    	    	}
 			    	    	}
-		    	    	}
-		    	    	
-		    	    	workcal.add(wocal);
+			    	    	
+			    	    	workcal.add(wocal);
+			    		}
 		    		}
 		    		}
 		    		
 		    		
+		    		
 	    		}
 	    		}
 	        }else {
 	        }else {
 	        	String time = date+"-01";
 	        	String time = date+"-01";