修改北森考勤对比

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

@@ -2016,7 +2016,7 @@ public class ReportController {
         Optional<LocalDate> min = dateList.stream().min(LocalDate::compareTo);
         //获取景昱的考勤和加班时长，进行比对，如果有不一致的，返回错误
         //错误信息格式：有加班工资的情况下，返回 异常：2024-04-18日填报工时(6h)不等于考勤总时长(8h);无加班工资情况下，返回 异常：2024-04-18日填报工时(8h)少于考勤工时(10h)
-        List<UserFvTime> userFvTimeList = userFvTimeMapper.selectList(new LambdaQueryWrapper<UserFvTime>().between(UserFvTime::getWorkDate, df.format(min.get()), df.format(max.get())));
+        List<UserFvTime> userFvTimeList = userFvTimeMapper.selectList(new LambdaQueryWrapper<UserFvTime>().between(UserFvTime::getWorkDate, df.format(min.get()), df.format(max.get())).eq(UserFvTime::getCompanyId, user.getCompanyId()).eq(UserFvTime::getUserId, userId));
         StringBuilder warningMsg = new StringBuilder();
         for (int i = 0; i < array.size(); i++) {
             JSONObject jsonObject = array.getJSONObject(i);
@@ -2030,7 +2030,7 @@ public class ReportController {
                 workingTime = jsonObject.getDouble("workingTime");
             }
 
-            Optional<UserFvTime> first = userFvTimeList.stream().filter(u -> u.getWorkDate().isEqual(date) && u.getUserId().equals(userId)).findFirst();
+            Optional<UserFvTime> first = userFvTimeList.stream().filter(u -> u.getWorkDate().isEqual(date)).findFirst();
             if(first.isPresent()){
                 if(first.get().getWorkHours()!=null){
                     Optional<User> optional = userList.stream().filter(u -> u.getId().equals(userId)).findFirst();