1

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

@@ -83,7 +83,7 @@ public class RoomServiceImpl extends ServiceImpl<IRoomMapper, Room> implements I
 
     @Override
     public PageInfo pageList(RoomListParam param, String token,String wxToken) {
-        log.info("roomList--token:{},wxToken:{}",token,wxToken);
+        //log.info("roomList--token:{},wxToken:{}",token,wxToken);
         if(StringUtils.isBlank(token) && StringUtils.isBlank(wxToken) ){
             Page<Room> page = new Page<>(param.getPageNum(),param.getPageSize());
             return PageInfo.PageInfo(page);
@@ -97,7 +97,9 @@ public class RoomServiceImpl extends ServiceImpl<IRoomMapper, Room> implements I
             }
             Page<Room> page = this.getBaseMapper().pageList(new Page<>(param.getPageNum(),param.getPageSize()),param);
             for (Room record : page.getRecords()) {
-                if(record.getRoomUserId() != null){
+                if(wxUser != null && record.getRoomUserId() != null
+                        && !record.getRoomUserName().equals(wxUser.getPhoneNumber())){
+
                     record.setRoomId(record.getRoomId() + "_"+ record.getRoomUserId());
                 }
                 record.setVisitPassword(null);