1

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

@@ -242,7 +242,6 @@ public class RoomServiceImpl extends ServiceImpl<IRoomMapper, Room> implements I
         String userName = null;
         if(StringUtils.isBlank(token)){
             roomVo.setVisitPassword(null);
-            userName = JwtUtil.getUserName(token);
         }
         if(StringUtils.isNotBlank(roomUserId) && StringUtils.isNotBlank(token)){
             FdkkUserVo userInfo = fdKKService.getUserInfo(token);
@@ -250,6 +249,7 @@ 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)){
@@ -268,7 +268,7 @@ public class RoomServiceImpl extends ServiceImpl<IRoomMapper, Room> implements I
                 roomVo.setRoomHostCode(roomUser.getRoomHostCode());
                 roomVo.setRoomShareCode(roomUser.getRoomShareCode());
                 roomVo.setHostStatus(roomUser.getHostStatus());
-                if(userName.equals(roomUser.getUserName())){
+                if(userName!= null && userName.equals(roomUser.getUserName())){
                     roomVo.setIsHost(1);
                     roomVo.setHostStatus(1);
                 }