1

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

@@ -123,10 +123,6 @@ public class RoomServiceImpl extends ServiceImpl<IRoomMapper, Room> implements I
 
         HashMap<String, DataCount> dataCountMap = roomVisitLogService.getGroupByRoomId();
         for (Room record : page.getRecords()) {
-            DataCount dataCount = dataCountMap.get(record.getRoomId());
-            if (dataCount != null) {
-                record.setRoomViewCount(dataCount.getDataCount());
-            }
 
             if (!record.getRoomUserName().equals(param.getUserName())) {
                 RoomUser roomUser = roomUserService.getByUserName(record.getRoomId(),param.getUserName());
@@ -144,7 +140,12 @@ public class RoomServiceImpl extends ServiceImpl<IRoomMapper, Room> implements I
                     }
                     record.setIsHomeOwner(false);
 
-                    dataCount = dataCountMap.get(record.getRoomId()+"_"+roomUser.getRoomUserId());
+                    DataCount dataCount = dataCountMap.get(record.getRoomId()+"_"+roomUser.getRoomUserId());
+                    if (dataCount != null) {
+                        record.setRoomViewCount(dataCount.getDataCount());
+                    }
+                }else {
+                    DataCount dataCount = dataCountMap.get(record.getRoomId());
                     if (dataCount != null) {
                         record.setRoomViewCount(dataCount.getDataCount());
                     }