1

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

@@ -91,7 +91,7 @@ public class RoomServiceImpl extends ServiceImpl<IRoomMapper, Room> implements I
             Page<Room> page = new Page<>(param.getPageNum(),param.getPageSize());
             return PageInfo.PageInfo(page);
         }
-
+        Page<Room> page = null;
         if(StringUtils.isNotBlank(wxToken)  ) {      //微信小程序调用，返回协作者房间
             String wxUserId = JwtUtil.getUserName(wxToken);
             WxUser wxUser = wxUserService.getById(wxUserId);
@@ -99,8 +99,8 @@ public class RoomServiceImpl extends ServiceImpl<IRoomMapper, Room> implements I
                 return PageInfo.PageInfo(new Page<>(param.getPageNum(), param.getPageSize()));
             }
             param.setUserName(wxUser.getPhoneNumber());
+            page = this.getBaseMapper().pageWxList(new Page<>(param.getPageNum(), param.getPageSize()), param);
         }
-
         if (StringUtils.isNotBlank(token)) {
             String fdToken = String.format(RedisKey.TOKEN_V3, token);
             if (!redisUtil.hasKey(fdToken)) {
@@ -109,10 +109,12 @@ public class RoomServiceImpl extends ServiceImpl<IRoomMapper, Room> implements I
             redisUtil.expire(fdToken, 6 * 60 * 60);
             String userName = JwtUtil.getUserName(token);
             param.setUserName(userName);
+            page = this.getBaseMapper().pageList(new Page<>(param.getPageNum(), param.getPageSize()), param);
+        }
+        if(page == null){
+            return PageInfo.PageInfo(new Page<>(param.getPageNum(),param.getPageSize()));
         }
-
         HashMap<String, DataCount> dataCountMap = roomVisitLogService.getGroupByRoomId();
-        Page<Room> page = this.getBaseMapper().pageWxList(new Page<>(param.getPageNum(), param.getPageSize()), param);
         for (Room record : page.getRecords()) {
             if (!record.getRoomUserName().equals(param.getUserName())) {
                 RoomUser roomUser = roomUserService.getByUserName(record.getRoomId(),param.getUserName());