小程序带看列表

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

@@ -92,12 +92,13 @@ public class RoomServiceImpl extends ServiceImpl<IRoomMapper, Room> implements I
         if(StringUtils.isNotBlank(wxToken)  ){      //微信小程序调用，返回协作者房间
             String wxUserId = JwtUtil.getUserName(wxToken);
             WxUser wxUser = wxUserService.getById(wxUserId);
-            if(wxUser != null){
-                param.setUserName(wxUser.getPhoneNumber());
+            if(wxUser == null || wxUser.getPhoneNumber() == null){
+                return PageInfo.PageInfo(new Page<>(param.getPageNum(),param.getPageSize()));
             }
+            param.setUserName(wxUser.getPhoneNumber());
             Page<Room> page = this.getBaseMapper().pageList(new Page<>(param.getPageNum(),param.getPageSize()),param);
             for (Room record : page.getRecords()) {
-                if(wxUser != null && !record.getRoomUserName().equals(wxUser.getPhoneNumber())){
+                if(!record.getRoomUserName().equals(wxUser.getPhoneNumber())){
                     RoomUser roomUser = roomUserService.getByUserName(record.getRoomId(),wxUser.getPhoneNumber());
                     if(roomUser != null){
                         record.setRoomId(record.getRoomId() + "_"+ roomUser.getRoomUserId());