| 
					
				 | 
			
			
				@@ -615,7 +615,10 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         if(classGroupIds.size() > 0){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             courseScheduleEvaluates = courseScheduleEvaluateDao.findByClassGroupIds(classGroupIds); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        Map<Integer, Long> reportMap = courseScheduleEvaluates.stream().collect(Collectors.toMap(CourseScheduleEvaluate::getClassGroupId, CourseScheduleEvaluate::getId)); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        Map<Integer, Long> reportMap = new HashMap<>(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        if(courseScheduleEvaluates.size()>0) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            reportMap = courseScheduleEvaluates.stream().collect(Collectors.toMap(CourseScheduleEvaluate::getClassGroupId, CourseScheduleEvaluate::getId)); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         Set<String> musicGroupId = musicCourse.stream().map(e -> e.getMusicId()).collect(Collectors.toSet()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 //        Set<String> vipGroupId = vipCourses.stream().map(e -> e.getVipId()).collect(Collectors.toSet()); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -671,7 +674,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 e.setStudentNames(practiceStuNames.get(e.getPracticeId())); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 e.setPracticeRenewUrl(practiceRenewUrlConfig.getParanValue() + e.getPracticeId()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 if(reportMap.containsKey(e.getClassGroupId())){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    e.setHasReport(true); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    //e.setHasReport(true); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     String baseUrl = sysConfigDao.findConfigValue(SysConfigService.BASE_API_URL); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     e.setStudyReportUrl(baseUrl + "/#/reportDetail?classGroupId=" + e.getClassGroupId()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 } 
			 |