Merge remote-tracking branch 'origin/master'

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

@@ -147,6 +147,7 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
         teacherHomeVo.setUnExpTime(null == total.getUnExpTime() ? 0 : total.getUnExpTime());
         teacherHomeVo.setMusicAlbumNum(null == total.getMusicAlbumNum() ? 0 : total.getMusicAlbumNum());
         teacherHomeVo.setMusicSheetNum(null == total.getMusicSheetNum() ? 0 : total.getMusicSheetNum());
+        teacherHomeVo.setLiveing(total.getLiveFlag() ? YesOrNoEnum.YES : YesOrNoEnum.NO);
         return HttpResponseResult.succeed(teacherHomeVo);
     }
 
@@ -322,13 +323,7 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
         if (null == data) {
             return HttpResponseResult.failed("未查询到用户信息");
         }
-        LiveRoom liveRoom = liveRoomService.getLiveInRoomBySpeakerId(teacherId);
-        if (null != liveRoom) {
-            data.setRoomUid(liveRoom.getRoomUid());
-            data.setLiveing(YesOrNoEnum.YES);
-        } else {
-            data.setLiveing(YesOrNoEnum.NO);
-        }
+
         if (null != studentId) {
             StudentStar studentStar = studentStarService.getByStudentIdAndTeacherId(studentId, teacherId);
             if (null == studentStar) {

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

@@ -43,6 +43,6 @@
 		left join sys_user us on t.teacher_id_ = us.id_
 		left join sys_user ut on t.student_id_ = ut.id_
 		where us.del_flag_ = 0 and ut.del_flag_ = 0
-		where t.student_id_ = #{studentId} and t.teacher_id_ = #{teacherId}
+		and t.student_id_ = #{studentId} and t.teacher_id_ = #{teacherId}
 	</select>
 </mapper>