Merge branch 'usky-zyj' of uskycloud/usky-modules into server-165

service-meeting/service-meeting-biz/src/main/java/com/usky/meeting/service/impl/MeetingRoomServiceImpl.java

@@ -205,8 +205,9 @@ public class MeetingRoomServiceImpl extends AbstractCrudService<MeetingRoomMappe
         List<DmMeetingRoomDto> newDmMeetingRoomDtoList = new ArrayList<>();
         Long meetingRoomId = reservationVO.getMeetingRoomId();
         LambdaQueryWrapper<MeetingRoom> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.eq(meetingRoomId != null, MeetingRoom::getRoomId, meetingRoomId)
-                .eq(MeetingRoom::getTenantId, SecurityUtils.getTenantId());
+        queryWrapper.eq(StringUtils.isNotBlank(reservationVO.getMeetingRoomId()),MeetingRoom::getRoomId,reservationVO.getMeetingRoomId())
+                .like(StringUtils.isNotBlank(meetingRoomName),MeetingRoom::getRoomName,meetingRoomName)
+                .eq(MeetingRoom::getTenantId,SecurityUtils.getTenantId());
         List<MeetingRoom> list1 = this.list(queryWrapper);
         List<Long> floorIdList = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(list1)) {

service-meeting/service-meeting-biz/src/main/java/com/usky/meeting/service/vo/MeetingRoomReservationVO.java

@@ -8,7 +8,7 @@ public class MeetingRoomReservationVO {
     /**
      * 会议室id
      */
-    private Long meetingRoomId;
+    private String meetingRoomId;
 
     /**
      * 会议室名称