|  | @@ -3,7 +3,6 @@ package com.ym.mec.biz.service.impl;
 | 
	
		
			
				|  |  |  import com.alibaba.fastjson.JSON;
 | 
	
		
			
				|  |  |  import com.baomidou.mybatisplus.core.metadata.IPage;
 | 
	
		
			
				|  |  |  import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 | 
	
		
			
				|  |  | -import com.ym.mec.biz.dal.entity.SchoolActivity;
 | 
	
		
			
				|  |  |  import com.ym.mec.biz.dal.entity.Student;
 | 
	
		
			
				|  |  |  import com.ym.mec.biz.dal.entity.Subject;
 | 
	
		
			
				|  |  |  import com.ym.mec.biz.dal.mapper.SchoolActivityMapper;
 | 
	
	
		
			
				|  | @@ -104,10 +103,10 @@ public class SchoolActivityDetailUserServiceImpl extends ServiceImpl<SchoolActiv
 | 
	
		
			
				|  |  |                  .remove();
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |          List<SchoolActivityDetailUser> schoolActivityDetailUsers = studentList.stream().flatMap(schoolActivitySubject -> {
 | 
	
		
			
				|  |  | -            if (CollectionUtils.isEmpty(schoolActivitySubject.getStudnetList())) {
 | 
	
		
			
				|  |  | +            if (CollectionUtils.isEmpty(schoolActivitySubject.getStudentList())) {
 | 
	
		
			
				|  |  |                  return Stream.empty();
 | 
	
		
			
				|  |  |              }
 | 
	
		
			
				|  |  | -            return schoolActivitySubject.getStudnetList().stream().map(o -> {
 | 
	
		
			
				|  |  | +            return schoolActivitySubject.getStudentList().stream().map(o -> {
 | 
	
		
			
				|  |  |                  SchoolActivityDetailUser schoolActivityDetailUser = new SchoolActivityDetailUser();
 | 
	
		
			
				|  |  |                  schoolActivityDetailUser.setSchoolActivityDetailId(schoolActivityDetailId);
 | 
	
		
			
				|  |  |                  schoolActivityDetailUser.setStudentId(o.getStudentId());
 | 
	
	
		
			
				|  | @@ -196,7 +195,7 @@ public class SchoolActivityDetailUserServiceImpl extends ServiceImpl<SchoolActiv
 | 
	
		
			
				|  |  |              schoolActivitySubject.setSubjectId(k);
 | 
	
		
			
				|  |  |              schoolActivitySubject.setSubjectName(v.get(0).getSubjectName());
 | 
	
		
			
				|  |  |              schoolActivitySubject.setStudentCount(v.size());
 | 
	
		
			
				|  |  | -            schoolActivitySubject.setStudnetList(v);
 | 
	
		
			
				|  |  | +            schoolActivitySubject.setStudentList(v);
 | 
	
		
			
				|  |  |              schoolActivitySubjects.add(schoolActivitySubject);
 | 
	
		
			
				|  |  |          });
 | 
	
		
			
				|  |  |  
 |