| 
					
				 | 
			
			
				@@ -122,10 +122,10 @@ public class StudentManageServiceImpl implements StudentManageService { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             Map<Integer,String> subjectNames = MapUtil.convertMybatisMap(studentManageDao.querySubjectNames(userIds)); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             dataList.forEach(e -> { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 e.setOrganName(organNames.get(e.getOrganId())); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                e.setMusicGroupName(musicGroupNames.get(e.getUserId())); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                e.setMusicGroupName(musicGroupNames.get(e.getUserId())==null?musicGroupNames.get(e.getUserId().longValue()):null); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 e.setVipGroupName(vipGroupNames.get(e.getUserId())); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 e.setSubjectName(subjectNames.get(e.getUserId())); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                e.setMusicGroupStatus(musicGroupStatus.get(e.getUserId())); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                e.setMusicGroupStatus(musicGroupStatus.get(e.getUserId())==null?musicGroupStatus.get(e.getUserId().longValue()):null); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 e.setVipGroupStatus(vipGroupStatus.get(e.getUserId())); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 if(hasCourse == null){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     Integer course = studentManageDao.getHasCourse(e.getUserId()); 
			 |