1、查询会议预定信息会议室id非必传

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/meeting/reserve/OaMeetingReserveController.java

@@ -205,10 +205,10 @@ public class OaMeetingReserveController {
 
     @GetMapping("/list")
     @Operation(summary = "获得会议室预定管理信息列表")
-    @Parameter(name = "roomId", description = "会议室id", required = true, example = "2")
+    @Parameter(name = "roomId", description = "会议室id", required = false, example = "2")
     @Parameter(name = "month", description = "年月，格式：yyyy-MM", required = true, example = "2024-07")
     // @PreAuthorize("@ss.hasPermission('bpm:oa-meeting-reserve:list')")
-    public CommonResult<List<OaMeetingReserveRespVO>> getOaMeetingReserveList(@RequestParam("roomId") Long roomId, @RequestParam("month") String month) throws ParseException {
+    public CommonResult<List<OaMeetingReserveRespVO>> getOaMeetingReserveList(@RequestParam(value = "roomId", required = false) Long roomId, @RequestParam("month") String month) throws ParseException {
         List<OaMeetingReserveDO> doList = oaMeetingReserveService.getOaMeetingReserveList(roomId, month);
         List<OaMeetingReserveRespVO> voList = BeanUtils.toBean(doList, OaMeetingReserveRespVO.class);
         if (CollUtil.isNotEmpty(voList)) {

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/meeting/reserve/OaMeetingReserveServiceImpl.java

@@ -26,6 +26,7 @@ import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.time.temporal.ChronoUnit;
 import java.util.Calendar;
+import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -262,6 +263,10 @@ public class OaMeetingReserveServiceImpl implements OaMeetingReserveService {
         startMeetingList();
         endMeetingList();
 
+        if (roomId == null || StrUtil.isBlank(month)) {
+            return Collections.emptyList();
+        }
+
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");
         Date parse = sdf.parse(month);
         Calendar c1 = Calendar.getInstance();