|
@@ -132,8 +132,8 @@ public class FairAnalysisServiceImpl implements FairAnalysisService {
|
|
//学校,专业
|
|
//学校,专业
|
|
StudentRespVO studentRespVO = studentRespVOS.get(item.getUserId());
|
|
StudentRespVO studentRespVO = studentRespVOS.get(item.getUserId());
|
|
if(null!=studentRespVO) {
|
|
if(null!=studentRespVO) {
|
|
- excelVo.setSchoolName(studentRespVO.getSchoolInfo().getName());
|
|
|
|
- excelVo.setMajor(studentRespVO.getMajor().getNameCn());
|
|
|
|
|
|
+ excelVo.setSchoolName(null==studentRespVO.getSchoolInfo()?"":studentRespVO.getSchoolInfo().getName());
|
|
|
|
+ excelVo.setMajor(null==studentRespVO.getMajor()?"":studentRespVO.getMajor().getNameCn());
|
|
}
|
|
}
|
|
res.add(excelVo);
|
|
res.add(excelVo);
|
|
});
|
|
});
|