|
@@ -2163,13 +2163,13 @@ public class ExportController extends BaseController {
|
|
|
|
|
|
for (OrderByTypeExportDto order : orders) {
|
|
|
for (VipBuyResultDto vipGroupTeacher : vipGroupTeachers) {
|
|
|
- if(order.getMusicGroupId().equals(vipGroupTeacher.getVipGroupId().longValue())){
|
|
|
+ if(order.getGroupType().equals(GroupType.VIP) && order.getMusicGroupId().equals(vipGroupTeacher.getVipGroupId().longValue())){
|
|
|
order.setTeacherName(vipGroupTeacher.getTeacherName());
|
|
|
order.setEduTeacherName(vipGroupTeacher.getEduTeacherName());
|
|
|
}
|
|
|
}
|
|
|
for (PracticeCourseDto practiceCourseDto : practiceGroupsTeacher) {
|
|
|
- if(order.getMusicGroupId().equals(practiceCourseDto.getId())){
|
|
|
+ if(order.getGroupType().equals(GroupType.PRACTICE) && order.getMusicGroupId().equals(practiceCourseDto.getId())){
|
|
|
order.setTeacherName(practiceCourseDto.getTeacherName());
|
|
|
order.setEduTeacherName(practiceCourseDto.getEduTeacherName());
|
|
|
}
|