|
@@ -2345,8 +2345,10 @@ public class ExportController extends BaseController {
|
|
//如果合作单位不存在取学员的第一个乐团的合作单位和教学点
|
|
//如果合作单位不存在取学员的第一个乐团的合作单位和教学点
|
|
if (row.getCooperationOrganName() == null) {
|
|
if (row.getCooperationOrganName() == null) {
|
|
CooperationOrgan cooperationOrgan = musicGroupDao.findUserMusicGroupCooperationOrgan(row.getUserId());
|
|
CooperationOrgan cooperationOrgan = musicGroupDao.findUserMusicGroupCooperationOrgan(row.getUserId());
|
|
- row.setCooperationOrganName(cooperationOrgan.getName());
|
|
|
|
- if (row.getSchoolName() != null) {
|
|
|
|
|
|
+ if (cooperationOrgan != null) {
|
|
|
|
+ row.setCooperationOrganName(cooperationOrgan.getName());
|
|
|
|
+ }
|
|
|
|
+ if (row.getSchoolName() == null && cooperationOrgan != null) {
|
|
//linkman 赋予教学点值
|
|
//linkman 赋予教学点值
|
|
row.setSchoolName(cooperationOrgan.getLinkman());
|
|
row.setSchoolName(cooperationOrgan.getLinkman());
|
|
}
|
|
}
|