| 
					
				 | 
			
			
				@@ -91,28 +91,17 @@ public class ExtracurricularExercisesServiceImpl extends BaseServiceImpl<Long, E 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		if(StringUtils.isBlank(exercises.getContent())){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			// throw new BizException("请填写内容"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-		List<MusicScoreSubjectDto> scoreSubjectDtoList = exercises.getMusicScoreSubjectDtos(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        if (exercises.getClassGroupId() != null) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            List<ClassGroupStudentMapper> studentMapperList = classGroupStudentMapperDao.findByClassGroup( 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                exercises.getClassGroupId()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            if (CollectionUtils.isEmpty(studentMapperList)) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                throw new BizException("班级学生为空"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        List<MusicScoreSubjectDto> scoreSubjectDtoList = exercises.getMusicScoreSubjectDtos(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        if(StringUtils.isBlank(exercises.getStudentIdList())){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            if(scoreSubjectDtoList == null || scoreSubjectDtoList.size() == 0){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                throw new BizException("请指定学生"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            List<Integer> studentIdList = new ArrayList<>(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            for (MusicScoreSubjectDto musicScoreSubjectDto : scoreSubjectDtoList) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                studentIdList.addAll(musicScoreSubjectDto.getUserIdList()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            List<Integer> studentIdList = studentMapperList.stream() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                .filter(o -> !o.getStatus().equals(ClassGroupStudentStatusEnum.QUIT)) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-               .map(ClassGroupStudentMapper::getUserId) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                .collect(Collectors.toList()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             exercises.setStudentIdList(StringUtils.join(studentIdList,",")); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				- 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        } else if(StringUtils.isNotBlank(exercises.getStudentIdList()) || CollectionUtils.isEmpty(scoreSubjectDtoList)) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-			List<Integer> studentIdList = new ArrayList<>(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-			for (MusicScoreSubjectDto musicScoreSubjectDto : scoreSubjectDtoList) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-				studentIdList.addAll(musicScoreSubjectDto.getUserIdList()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-			} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-			exercises.setStudentIdList(StringUtils.join(studentIdList,",")); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-		} else { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            throw new BizException("请指定学生"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		teacherDao.getLocked(exercises.getTeacherId()); 
			 |