| 
														
															@@ -454,9 +454,9 @@ public class StudentServeServiceImpl implements StudentServeService { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                     if(codeServeMap.containsKey(result.getStuAndTeaCode())){ 
														 | 
														
														 | 
														
															                     if(codeServeMap.containsKey(result.getStuAndTeaCode())){ 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                         StudentExtracurricularExercisesSituation s = codeServeMap.get(result.getStuAndTeaCode()); 
														 | 
														
														 | 
														
															                         StudentExtracurricularExercisesSituation s = codeServeMap.get(result.getStuAndTeaCode()); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                         Set<Long> courseIds = new HashSet<>(); 
														 | 
														
														 | 
														
															                         Set<Long> courseIds = new HashSet<>(); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-                        if(StringUtils.isNotBlank(s.getCourseIds())&&s.getActualExercisesNum()>0){ 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-                            courseIds = Arrays.stream(s.getCourseIds().split(",")).map(id->Long.valueOf(id)).collect(Collectors.toSet()); 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-                        } 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+//                        if(StringUtils.isNotBlank(s.getCourseIds())&&s.getActualExercisesNum()>0){ 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+//                            courseIds = Arrays.stream(s.getCourseIds().split(",")).map(id->Long.valueOf(id)).collect(Collectors.toSet()); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+//                        } 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                         if(StringUtils.isNotBlank(result.getCourseIds())){ 
														 | 
														
														 | 
														
															                         if(StringUtils.isNotBlank(result.getCourseIds())){ 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                             courseIds.addAll(Arrays.stream(result.getCourseIds().split(",")).map(id->Long.valueOf(id)).collect(Collectors.toSet())); 
														 | 
														
														 | 
														
															                             courseIds.addAll(Arrays.stream(result.getCourseIds().split(",")).map(id->Long.valueOf(id)).collect(Collectors.toSet())); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                         } 
														 | 
														
														 | 
														
															                         } 
														 |