|  | @@ -53,9 +53,9 @@ public class TeacherSubjectPriceController extends BaseController {
 | 
	
		
			
				|  |  |                  .eq(query.getSubjectId() != null, TeacherSubjectPrice::getSubjectId, query.getSubjectId())
 | 
	
		
			
				|  |  |                  .eq(StringUtils.isNotEmpty(query.getCourseType()), TeacherSubjectPrice::getCourseType, query.getCourseType())
 | 
	
		
			
				|  |  |                  .list();
 | 
	
		
			
				|  |  | -        TeacherSubjectPriceWrapper.TeacherSubjectPriceDto dto = new TeacherSubjectPriceWrapper.TeacherSubjectPriceDto();
 | 
	
		
			
				|  |  |          if(CollectionUtils.isNotEmpty(list)){
 | 
	
		
			
				|  |  |              //获取所有的声部、声部名称
 | 
	
		
			
				|  |  | +            TeacherSubjectPriceWrapper.TeacherSubjectPriceDto dto = new TeacherSubjectPriceWrapper.TeacherSubjectPriceDto();
 | 
	
		
			
				|  |  |              String subjectIds = list.stream().map(e->e.getSubjectId().toString()).distinct().collect(Collectors.joining(","));
 | 
	
		
			
				|  |  |              String subjectNames = list.stream().map(TeacherSubjectPrice::getSubjectName).distinct().collect(Collectors.joining(","));
 | 
	
		
			
				|  |  |              dto.setSubjectId(subjectIds);
 | 
	
	
		
			
				|  | @@ -65,8 +65,9 @@ public class TeacherSubjectPriceController extends BaseController {
 | 
	
		
			
				|  |  |              dto.setFreeMinutes(list.get(0).getFreeMinutes());
 | 
	
		
			
				|  |  |              dto.setCourseMinutes(list.get(0).getCourseMinutes());
 | 
	
		
			
				|  |  |              dto.setSubjectPrice(list.get(0).getSubjectPrice());
 | 
	
		
			
				|  |  | +            return succeed(dto);
 | 
	
		
			
				|  |  |          }
 | 
	
		
			
				|  |  | -        return succeed(dto);
 | 
	
		
			
				|  |  | +        return succeed();
 | 
	
		
			
				|  |  |      }
 | 
	
		
			
				|  |  |  }
 | 
	
		
			
				|  |  |  
 |