1

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

@@ -92,48 +92,43 @@ public class RoomServiceImpl extends ServiceImpl<IRoomMapper, Room> implements I
             return PageInfo.PageInfo(page);
         }
 
-        if(StringUtils.isNotBlank(wxToken)  ){      //微信小程序调用，返回协作者房间
+        if(StringUtils.isNotBlank(wxToken)  ) {      //微信小程序调用，返回协作者房间
             String wxUserId = JwtUtil.getUserName(wxToken);
             WxUser wxUser = wxUserService.getById(wxUserId);
-            if(wxUser == null || wxUser.getPhoneNumber() == null){
-                return PageInfo.PageInfo(new Page<>(param.getPageNum(),param.getPageSize()));
+            if (wxUser == null || wxUser.getPhoneNumber() == null) {
+                return PageInfo.PageInfo(new Page<>(param.getPageNum(), param.getPageSize()));
             }
             param.setUserName(wxUser.getPhoneNumber());
-            Page<Room> page = this.getBaseMapper().pageWxList(new Page<>(param.getPageNum(),param.getPageSize()),param);
-            for (Room record : page.getRecords()) {
-                if(!record.getRoomUserName().equals(wxUser.getPhoneNumber())){
-                    RoomUser roomUser = roomUserService.getByUserName(record.getRoomId(),wxUser.getPhoneNumber());
-                    if(roomUser != null){
-                        record.setRoomId(record.getRoomId() + "_"+ roomUser.getRoomUserId());
-                        record.setHostStatus(roomUser.getHostStatus());
-                        if(roomUser.getLastLookTime() != null){
-                            record.setLastLookTime(Dateutils.getDate(roomUser.getLastLookTime()));
-                        }else {
-                            record.setLastLookTime(null);
-                        }
-                    }
-                }
-                record.setVisitPassword(null);
-            }
-            return PageInfo.PageInfo(page);
         }
 
-        if(StringUtils.isNotBlank(token)){
-            String fdToken = String.format(RedisKey.TOKEN_V3,token);
-            if(! redisUtil.hasKey(fdToken)){
+        if (StringUtils.isNotBlank(token)) {
+            String fdToken = String.format(RedisKey.TOKEN_V3, token);
+            if (!redisUtil.hasKey(fdToken)) {
                 throw new BusinessException(ResultCode.USER_NOT_LOGIN);
             }
-            redisUtil.expire(fdToken,6 * 60 * 60);
+            redisUtil.expire(fdToken, 6 * 60 * 60);
             String userName = JwtUtil.getUserName(token);
             param.setUserName(userName);
         }
 
-        Page<Room> page = this.getBaseMapper().pageList(new Page<>(param.getPageNum(),param.getPageSize()),param);
-        HashMap<String,DataCount> dataCountMap =  roomVisitLogService.getGroupByRoomId();
+        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());
+                if (roomUser != null) {
+                    record.setRoomId(record.getRoomId() + "_" + roomUser.getRoomUserId());
+                    record.setHostStatus(roomUser.getHostStatus());
+                    if (roomUser.getLastLookTime() != null) {
+                        record.setLastLookTime(Dateutils.getDate(roomUser.getLastLookTime()));
+                    } else {
+                        record.setLastLookTime(null);
+                    }
+                }
+            }
             record.setVisitPassword(null);
             DataCount dataCount = dataCountMap.get(record.getRoomId());
-            if(dataCount != null){
+            if (dataCount != null) {
                 record.setRoomViewCount(dataCount.getDataCount());
             }
         }