Browse Source

update routeList

周箭河 4 years ago
parent
commit
7983d52e4f

+ 4 - 2
mec-web/src/main/java/com/ym/mec/web/controller/ExportController.java

@@ -2345,8 +2345,10 @@ public class ExportController extends BaseController {
             //如果合作单位不存在取学员的第一个乐团的合作单位和教学点
             if (row.getCooperationOrganName() == null) {
                 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 赋予教学点值
                     row.setSchoolName(cooperationOrgan.getLinkman());
                 }