| 
					
				 | 
			
			
				@@ -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); 
			 |