|
@@ -212,9 +212,11 @@ public class ExportController extends BaseController {
|
|
|
}
|
|
|
}else if (row.getGroupType().equals(GroupType.VIP)){
|
|
|
VipGroup vipGroupInfo = vipGroupDao.findVipGroupInfo(Integer.parseInt(row.getMusicGroupId()), row.getClassGroupId());
|
|
|
- row.setOrganName(vipGroupInfo.getOrganName());
|
|
|
- row.setSchoolName(vipGroupInfo.getSchoolName());
|
|
|
- row.setSubjectName(vipGroupInfo.getSubjectName());
|
|
|
+ if(vipGroupInfo != null) {
|
|
|
+ row.setOrganName(vipGroupInfo.getOrganName());
|
|
|
+ row.setSchoolName(vipGroupInfo.getSchoolName());
|
|
|
+ row.setSubjectName(vipGroupInfo.getSubjectName());
|
|
|
+ }
|
|
|
|
|
|
}else if(row.getGroupType().equals(GroupType.SPORADIC)){
|
|
|
SporadicChargeInfo sporadicChargeInfo = sporadicChargeInfoDao.findInfoById(Integer.parseInt(row.getMusicGroupId()));
|