Merge branch 'lal' into 'develop'

提交

See merge request 8timerv2/8timerapiv200!546

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

@@ -397,6 +397,7 @@ public class ClockInTool {
 	 */
 	 */
 	public static String[] doChinFilters(String[] filters, String target) {
 	public static String[] doChinFilters(String[] filters, String target) {
 		
 		
+		
 		target = ClockInTool.Str_Time_formatting(target,"yyyy-MM-dd");
 		target = ClockInTool.Str_Time_formatting(target,"yyyy-MM-dd");
 		
 		
 		String[] res = null;
 		String[] res = null;

src/main/java/cn/timer/api/controller/kqgl/atttimer/RealTimeUpdate.java

@@ -303,7 +303,7 @@ public class RealTimeUpdate{
 							 }
 							 }
 							 if(appmaps.length > 0) {
 							 if(appmaps.length > 0) {
 								 for(String aa : ClockInTool.deleteArrayNull(zdxx)) {
 								 for(String aa : ClockInTool.deleteArrayNull(zdxx)) {
-									 appmaps = ClockInTool.doChinFilters(ClockInTool.deleteArrayNull2(appmaps), aa);
+									 appmaps = ClockInTool.doChinFilters(ClockInTool.deleteArrayNull(appmaps), aa);
 								 }
 								 }
 							 }
 							 }