Quellcode durchsuchen

Update BusMeetingRoomScheduleServiceImpl.java

shenzhongzheng vor 2 Jahren
Ursprung
Commit
189e3f4608

+ 6 - 3
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/BusMeetingRoomScheduleServiceImpl.java

@@ -113,8 +113,11 @@ public class BusMeetingRoomScheduleServiceImpl extends ServiceImpl<BusMeetingRoo
         List<BusMeetingRoomScheduleDetail> scheduleDetails =  meetingRoomScheduleDetailService.fetchByDateRange(startTime,endTime, hotelId,meetingIds);
 
         List<String> scheduleIds =  scheduleDetails.stream().map(v -> v.getMeetingRoomScheduleId()).collect(Collectors.toList());
-        List<BusMeetingRoomSchedule> schedules =  meetingRoomScheduleMapper.selectBatchIds(scheduleIds);
-
+        List<BusMeetingRoomSchedule> schedules = new ArrayList<>();
+        if(!CollectionUtil.isEmpty(scheduleIds)){
+            schedules =  meetingRoomScheduleMapper.selectBatchIds(scheduleIds);
+        }
+        List<BusMeetingRoomSchedule> finalSchedules = schedules;
         busMeetingRooms.forEach(v -> {
             BusMeetingRoomScheduleVo vo = new BusMeetingRoomScheduleVo();
             vo.setMeetingRoomName(v.getName());
@@ -145,7 +148,7 @@ public class BusMeetingRoomScheduleServiceImpl extends ServiceImpl<BusMeetingRoo
                         if (map.containsKey(value_key)) {
                             scheduleDetailVos = map.get(value_key);
                         }
-                        Optional<BusMeetingRoomSchedule> scheduleOptional = schedules.stream().filter(sc -> sc.getId().equals(vl.getMeetingRoomScheduleId())).findFirst();
+                        Optional<BusMeetingRoomSchedule> scheduleOptional = finalSchedules.stream().filter(sc -> sc.getId().equals(vl.getMeetingRoomScheduleId())).findFirst();
                         if (!scheduleOptional.isPresent()) return;
                         BusMeetingRoomSchedule vl_schedule = scheduleOptional.get();
                         //生成数据