|  | @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 | 
	
		
			
				|  |  |  import com.google.common.collect.Lists;
 | 
	
		
			
				|  |  |  import com.ym.mec.biz.dal.enums.JobTypeEnum;
 | 
	
		
			
				|  |  |  import com.ym.mec.common.enums.UserGenderEnum;
 | 
	
		
			
				|  |  | +import com.ym.mec.common.security.AuthUser;
 | 
	
		
			
				|  |  |  import com.ym.mec.common.security.SecurityUtils;
 | 
	
		
			
				|  |  |  import com.ym.mec.education.base.BaseResponse;
 | 
	
		
			
				|  |  |  import com.ym.mec.education.base.PageResponse;
 | 
	
	
		
			
				|  | @@ -112,8 +113,14 @@ public class ClassGroupStudentMapperServiceImpl extends ServiceImpl<ClassGroupSt
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |      @Override
 | 
	
		
			
				|  |  |      public PageResponse getPageByTeacher(StudentReq studentReq) {
 | 
	
		
			
				|  |  | +        Teacher teacher;
 | 
	
		
			
				|  |  |          //判断当前登录人角色
 | 
	
		
			
				|  |  | -        Teacher teacher = teacherService.getById(SecurityUtils.getUser().getUserId());
 | 
	
		
			
				|  |  | +        AuthUser user = SecurityUtils.getUser();
 | 
	
		
			
				|  |  | +        if(Objects.nonNull(user)) {
 | 
	
		
			
				|  |  | +            teacher = teacherService.getById(user.getUserId());
 | 
	
		
			
				|  |  | +        }else {
 | 
	
		
			
				|  |  | +            teacher = teacherService.getById(studentReq.getTeacherId());
 | 
	
		
			
				|  |  | +        }
 | 
	
		
			
				|  |  |          if (Objects.nonNull(teacher)) {
 | 
	
		
			
				|  |  |              //教学主管
 | 
	
		
			
				|  |  |              QueryWrapper<MusicGroup> musicGroupQueryWrapper = new QueryWrapper<>();
 |