Merge branch 'develop' into 'master'

Develop

See merge request 8timerv2/8timerapiv200!512

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

@@ -433,7 +433,7 @@ public class RealTimeUpdate{
 								 }
 						     }
 						}
-					List<PunchRecord> initial = punchrecordmapper.getMaintenancePunchCardList(startDate,endDateyesterday,user.getEmpnum());
+					List<PunchRecord> initial = punchrecordmapper.getMaintenancePunchCardList(startDate,endDateyesterday,user.getEmpnum(),orgCode);
 //					    // 迟到次数  迟到时长  早退次数  早退时长
 //					    int latenum = 0,latehours = 0,leanum = 0,leahours = 0;// 迟到次数
 				    String[] cdts = new String[31];//迟到的具体天数