Merge branch 'feature/0803-im' of http://git.dayaedu.com/yonge/cooleshow

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/ImNetworkRoomMember.java

@@ -68,6 +68,7 @@ public class ImNetworkRoomMember implements Serializable {
     private boolean handFlag;
 
     @ApiModelProperty(value = "当前用户伴奏信息")
+    @TableField(exist = false)
     private List<CourseScheduleStudentMusicSheetResult> musicSheetResults;
 
     @TableField("im_user_id_")

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

@@ -58,13 +58,11 @@ public class ImNetworkRoomMemberServiceImpl extends ServiceImpl<ImNetworkRoomMem
             roomMember.setUserId(sysUser.getUserId());
             roomMember.setUsername(sysUser.getUsername());
             roomMember.setAvatar(sysUser.getAvatar());
+            roomMember.setImUserId(imGroupService.getImUserId(sysUser.getUserId(),userRole));
             baseMapper.insert(roomMember);
             //生成用户房间状态表
             imNetworkRoomMemberStatusService.add(roomMember);
         }
-
-        roomMember.setImUserId(imGroupService.getImUserId(sysUser.getUserId(),userRole));
-
         return roomMember;
     }