Merge branch 'dev_v1.3.5_20220927'

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/ImNetworkRoomMemberDao.java

@@ -22,7 +22,7 @@ public interface ImNetworkRoomMemberDao extends BaseMapper<ImNetworkRoomMember>
 
     List<ImNetworkRoomMember> queryByRoomId(@Param("roomId") String roomId);
 
-    void delByRidAndUid(@Param("roomId") String roomId, @Param("userId") Long userId);
+    void delByRidAndUid(@Param("roomId") String roomId, @Param("userId") Long userId, @Param("userRole") Integer userRole);
 
     int countByRoomId(@Param("roomId") String roomId);
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/ImNetworkRoomServiceImpl.java

@@ -221,9 +221,19 @@ public class ImNetworkRoomServiceImpl extends ServiceImpl<ImNetworkRoomDao, ImNe
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void joinRoomFailure(String roomId, ClientEnum clientType) {
+
+        // 当前登录用户ID
         Long userId = sysUserService.getUserId();
         log.info("joinRoomFailure: roomId={}, userId={}", roomId, userId);
-        imNetworkRoomMemberService.getDao().delByRidAndUid(roomId, userId);
+
+        // 网络教室用户身份
+        UserRoleEnum userRole = UserRoleEnum.TEACHER;
+        if (ClientEnum.STUDENT == clientType) {
+            userRole = UserRoleEnum.STUDENT;
+        }
+
+        // 删除网络教室学员
+        imNetworkRoomMemberService.getDao().delByRidAndUid(roomId, userId, userRole.ordinal());
     }
 
     @Override

cooleshow-user/user-biz/src/main/resources/config/mybatis/ImNetworkRoomMemberMapper.xml

@@ -44,7 +44,7 @@
         role_ = VALUES(role_)
     </insert>
     <delete id="delByRidAndUid">
-        DELETE FROM im_network_room_member WHERE room_id_ = #{roomId} AND user_id_ = #{userId}
+        DELETE FROM im_network_room_member WHERE room_id_ = #{roomId} AND user_id_ = #{userId} AND role_ = #{userRole}
     </delete>
     <select id="findByRidAndUid" resultMap="BaseResultMap">
         SELECT <include refid="Base_Column_List"/> FROM im_network_room_member