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

@@ -203,9 +203,10 @@ public class MeetingRoomServiceImpl extends AbstractCrudService<MeetingRoomMappe
     public List<DmMeetingRoomDto> getMeetingRoomReservationList(MeetingRoomReservationVO reservationVO) throws ParseException {
         List<DmMeetingRoomDto> list = new ArrayList<>();
         List<DmMeetingRoomDto> newDmMeetingRoomDtoList = new ArrayList<>();
+        String meetingRoomName = reservationVO.getMeetingRoomName();
         Long meetingRoomId = reservationVO.getMeetingRoomId();
         LambdaQueryWrapper<MeetingRoom> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.eq(StringUtils.isNotBlank(reservationVO.getMeetingRoomId()),MeetingRoom::getRoomId,reservationVO.getMeetingRoomId())
+        queryWrapper.eq(meetingRoomId != null,MeetingRoom::getRoomId,reservationVO.getMeetingRoomId())
                 .like(StringUtils.isNotBlank(meetingRoomName),MeetingRoom::getRoomName,meetingRoomName)
                 .eq(MeetingRoom::getTenantId,SecurityUtils.getTenantId());
         List<MeetingRoom> list1 = this.list(queryWrapper);

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

@@ -1,5 +1,7 @@
 package com.usky.meeting.service.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.squareup.moshi.Json;
 import lombok.Data;
 
 @Data
@@ -8,7 +10,8 @@ public class MeetingRoomReservationVO {
     /**
      * 会议室id
      */
-    private String meetingRoomId;
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long meetingRoomId;
 
     /**
      * 会议室名称