1

src/main/java/com/fdkankan/tk/service/impl/RoomServiceImpl.java

@@ -115,6 +115,12 @@ public class RoomServiceImpl extends ServiceImpl<IRoomMapper, Room> implements I
         if(page == null){
             return PageInfo.PageInfo(new Page<>(param.getPageNum(),param.getPageSize()));
         }
+        FdkkUserVo userInfo = null;
+        if( StringUtils.isNotBlank(token)){
+             userInfo = fdKKService.getUserInfo(token);
+        }
+
+
         HashMap<String, DataCount> dataCountMap = roomVisitLogService.getGroupByRoomId();
         for (Room record : page.getRecords()) {
             if (!record.getRoomUserName().equals(param.getUserName())) {
@@ -127,6 +133,10 @@ public class RoomServiceImpl extends ServiceImpl<IRoomMapper, Room> implements I
                     } else {
                         record.setLastLookTime(null);
                     }
+                    if(userInfo != null){
+                        record.setRoomHostName(userInfo.getNickName());
+                        record.setRoomUserName(userInfo.getUserName());
+                    }
                 }
             }
             record.setVisitPassword(null);
@@ -242,6 +252,8 @@ public class RoomServiceImpl extends ServiceImpl<IRoomMapper, Room> implements I
         String userName = null;
         if(StringUtils.isBlank(token)){
             roomVo.setVisitPassword(null);
+        }else {
+            userName = JwtUtil.getUserName(token);
         }
         if(StringUtils.isNotBlank(roomUserId) && StringUtils.isNotBlank(token)){
             FdkkUserVo userInfo = fdKKService.getUserInfo(token);
@@ -249,7 +261,6 @@ public class RoomServiceImpl extends ServiceImpl<IRoomMapper, Room> implements I
                 roomVo.setRoomHostName(userInfo.getNickName());
                 roomVo.setRoomUserName(userInfo.getUserName());
             }
-            userName = JwtUtil.getUserName(token);
         }
         //
         if(StringUtils.isNotBlank(wxToken)){