Bladeren bron

微信小程序,主持人列表

lyhzzz 2 jaren geleden
bovenliggende
commit
c049c59e81

+ 2 - 0
src/main/java/com/fdkankan/tk/service/IRoomUserService.java

@@ -32,4 +32,6 @@ public interface IRoomUserService extends IService<RoomUser> {
     void stopRoom(RoomUser roomUser);
 
     List<RoomUser> getRunningRoom();
+
+    RoomUser getByUserName(String roomId,String phoneNumber);
 }

+ 4 - 1
src/main/java/com/fdkankan/tk/service/impl/RoomServiceImpl.java

@@ -100,7 +100,10 @@ public class RoomServiceImpl extends ServiceImpl<IRoomMapper, Room> implements I
                 if(wxUser != null && record.getRoomUserId() != null
                         && !record.getRoomUserName().equals(wxUser.getPhoneNumber())){
 
-                    record.setRoomId(record.getRoomId() + "_"+ record.getRoomUserId());
+                    RoomUser roomUser = roomUserService.getByUserName(record.getRoomId(),wxUser.getPhoneNumber());
+                    if(roomUser != null){
+                        record.setRoomId(record.getRoomId() + "_"+ roomUser.getRoomUserId());
+                    }
                 }
                 record.setVisitPassword(null);
             }

+ 8 - 0
src/main/java/com/fdkankan/tk/service/impl/RoomUserServiceImpl.java

@@ -136,4 +136,12 @@ public class RoomUserServiceImpl extends ServiceImpl<IRoomUserMapper, RoomUser>
         wrapper.eq(RoomUser::getRoomStatus,1);
         return list(wrapper);
     }
+
+    @Override
+    public RoomUser getByUserName(String roomId,String phoneNumber) {
+        LambdaQueryWrapper<RoomUser> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(RoomUser::getUserName,phoneNumber);
+        wrapper.eq(RoomUser::getRoomId,roomId);
+        return this.getOne(wrapper);
+    }
 }

+ 2 - 1
src/main/resources/mapper/tk/RoomMapper.xml

@@ -7,7 +7,8 @@
     </select>
 
     <select id="pageList" resultType="com.fdkankan.tk.entity.Room">
-        select  r.*,ru.room_user_id from t_room r left join t_room_user ru on r.room_id = ru.room_id
+        select DISTINCT r.* from t_room r
+            left join t_room_user ru on r.room_id = ru.room_id
         where r.tb_status = 0 and ru.tb_status = 0
         <if test="param.userName != null and param.userName !='' ">
             and (r.room_user_name = #{param.userName} or ru.user_name = #{param.userName})