Merge branch 'bug_20220913'

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/ActivityEvaluationController.java

@@ -106,7 +106,6 @@ public class ActivityEvaluationController extends BaseController {
 		query.setAuditStatus(AuthStatusEnum.PASS);
 		query.setState(YesOrNoEnum.YES);
 		query.setAuditVersion(YesOrNoEnum.NO);
-
 		IPage<MusicSheetVo> musicSheetVoIPage = activityEvaluationService.musicPage(PageUtil.getPage(query), query);
 		return succeed(PageUtil.pageInfo(musicSheetVoIPage));
 	}

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

@@ -1314,7 +1314,7 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleDao, Co
         if (teacherId == null) {
         	Student student = studentService.getById(studentId);
         	Long subjectId = null;
-            if (student != null) {
+            if (student != null && student.getSubjectId() != null) {
             	subjectId = Long.parseLong(student.getSubjectId());
             }
             

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

@@ -636,8 +636,12 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
     	}
     	
     	Student student = studentService.getById(userId);
+        Long subjectId = null;
+        if (student.getSubjectId()!= null) {
+            subjectId = Long.parseLong(student.getSubjectId());
+        }
     	
-    	List<HotTeacherVo> hotTeacherList = baseMapper.queryHotTeacherList(Long.parseLong(student.getSubjectId()));
+    	List<HotTeacherVo> hotTeacherList = baseMapper.queryHotTeacherList(subjectId);
     	for(HotTeacherVo vo : hotTeacherList){
     		if(watchTeacherIdList.contains(vo.getUserId())){
     			vo.setWatch(true);