|
@@ -2942,8 +2942,8 @@ public class ExportServiceImpl implements ExportService {
|
|
|
basicOrder.setMemo(goodsName);
|
|
|
}
|
|
|
if (basicOrder.getType() == OUTORDER && StringUtils.isNotEmpty(basicOrder.getMusicGroupId())) {
|
|
|
- if (cooperationOrganMap.containsKey(Integer.valueOf(basicOrder.getMusicGroupId()))) {
|
|
|
- basicOrder.setCooperationOrganName(cooperationOrganMap.get(Integer.valueOf(basicOrder.getMusicGroupId())));
|
|
|
+ if (cooperationOrganMap.containsKey(basicOrder.getCooperationId())) {
|
|
|
+ basicOrder.setCooperationOrganName(cooperationOrganMap.get(basicOrder.getCooperationId()));
|
|
|
CooperationOrgan cooperationOrganEduTeacher = musicGroupService.getDao().findCooperationOrganEduTeacher(Integer.valueOf(basicOrder.getMusicGroupId()));
|
|
|
if (cooperationOrganEduTeacher != null) {
|
|
|
basicOrder.setEduTeacher(cooperationOrganEduTeacher.getLinkman());
|