考勤汇总节假日周末补班没有正常汇总bug修改

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceStatServiceImpl.java

@@ -212,7 +212,7 @@ public class AttendanceStatServiceImpl extends AbstractCRUDServiceImpl<Attendanc
             int dayOfWeek = cal.get(Calendar.DAY_OF_WEEK);
             if(dayOfWeek==1||dayOfWeek==7){
                 //节假日周末补班
-                if(!isReturn){
+                if(holidayEntity != null && holidayEntity.getWorkorholiday()==1){
                     query.setDayOfWeek(2);
                 }
             }else {