1

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

@@ -363,7 +363,9 @@ public class UserFvTimeController {
                 userFvTime.setEndTime(LocalTime.parse(String.valueOf(item.get("afterWorkTime")),time).format(time));
                 Duration between = Duration.between(LocalTime.parse(String.valueOf(item.get("clockInTime")), time), LocalTime.parse(String.valueOf(item.get("afterWorkTime")), time));
                 BigDecimal bigDecimal=new BigDecimal(between.toHours());
-                bigDecimal=bigDecimal.subtract(new BigDecimal(1.5));
+                if(bigDecimal.intValue()>0){
+                    bigDecimal=bigDecimal.subtract(new BigDecimal(1.5));
+                }
                 userFvTime.setWorkHours(bigDecimal.floatValue());
                 if(!allList.stream().anyMatch(al->al.getUserId().equals(user.get().getId())&&al.getWorkDate().equals(LocalDate.parse(String.valueOf(item.get("signDate")),date)))){
                     userFvTimeList.add(userFvTime);