lyhzzz 2 лет назад
Родитель
Сommit
71659817a0

+ 2 - 0
src/main/java/com/fdkankan/tk/entity/RoomUser.java

@@ -3,6 +3,7 @@ package com.fdkankan.tk.entity;
 import com.baomidou.mybatisplus.annotation.*;
 
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -72,6 +73,7 @@ public class RoomUser implements Serializable {
 
     public List<Date> getUseTimeList() {
         if(useStartTime != null && useEndTime !=null){
+            useTimeList = new ArrayList<>();
             useTimeList.add(useStartTime);
             useTimeList.add(useEndTime);
         }

+ 1 - 1
src/main/java/com/fdkankan/tk/response/RoomVo.java

@@ -11,7 +11,7 @@ public class RoomVo extends Room {
 
     private List<SceneVo> sceneData;
 
-    private List<RoomUser> roomUserList;
+    private List<RoomUser> userObjList;
 
     private Integer isHost = 0;  // 0 不是房主,1为房主
 }

+ 1 - 1
src/main/java/com/fdkankan/tk/service/impl/RoomServiceImpl.java

@@ -215,7 +215,7 @@ public class RoomServiceImpl extends ServiceImpl<IRoomMapper, Room> implements I
 
         roomVo.setSceneData(list);
         List<RoomUser> roomUserList = roomUserService.getByRoomId(roomId);
-        roomVo.setRoomUserList(roomUserList);
+        roomVo.setUserObjList(roomUserList);
         return roomVo;
     }