1

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/ReportController.java

@@ -864,7 +864,13 @@ public class ReportController {
                             decimalFormat.format(report.getWorkingTime())));
                     return httpRespMsg;
                 }
-                if(comTimeType.getWorkOvertimeNeedCheck()==1&&WorkDayCalculateUtils.isWorkDay(report.getCreateDate())){
+
+            }
+        }
+        //如果开启了加班时长校验
+        if(comTimeType.getWorkOvertimeNeedCheck()==1){
+            for (Report report : reportList) {
+                if(WorkDayCalculateUtils.isWorkDay(report.getCreateDate())){
                     HttpRespMsg httpRespMsg = new HttpRespMsg();
                     BigDecimal bigDecimal=new BigDecimal(report.getWorkingTime());
                     bigDecimal=bigDecimal.subtract(new BigDecimal(comTimeType.getAllday()));