fix 新增会议室名称 接口recent

xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/meeting/controller/api/DmMeetingInnerApiController.java

@@ -383,16 +383,19 @@ public class DmMeetingInnerApiController extends BaseApiController {
 
         List<DmMeetingOrdersPo> list = new ArrayList<>();
         List<Long> ids = new ArrayList<>();
+        Map<Long, String> rooms = new HashMap<>();
         if (null == roomId) {
             DmMeetingRoomsPo dm = new DmMeetingRoomsPo();
             dm.setDeptId(deptId);
             List<DmMeetingRoomsPo> pos = dmMeetingRoomsMapper.selectRoomList(dm);
             ids = pos.stream().map(DmMeetingRoomsPo::getId).collect(Collectors.toList());
+            rooms = pos.stream().collect(Collectors.toMap(DmMeetingRoomsPo::getId, DmMeetingRoomsPo::getName));
             list = dmMeetingOrdersMapper.findListByDateStr(dateStr);
         } else {
             DmMeetingRoomsPo po = dmMeetingRoomsMapper.findById(roomId);
             list = dmMeetingOrdersMapper.findListByDate(dateStr, po.getId());
             ids.add(roomId);
+            rooms.put(po.getId(), po.getName());
         }
 
 
@@ -434,7 +437,8 @@ public class DmMeetingInnerApiController extends BaseApiController {
             List<JSONObject> value = freeTime.get(key);
             arr.addAll(freeTime.get(key));
         }
-        arr = arr.stream().sorted((o1, o2) -> o2.getString("startTime").compareTo(o1.getString("startTime"))).collect(Collectors.toList());
+        Map<Long, String> finalRooms = rooms;
+        arr = arr.stream().map(j->{j.put("roomName", finalRooms.get(j.getLong("roomId")));return j;}).sorted((o1, o2) -> o2.getString("startTime").compareTo(o1.getString("startTime"))).collect(Collectors.toList());
         return arr;
     }