|
@@ -733,12 +733,16 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
|
|
|
if(teacherIds.size() > 0){
|
|
|
List<ImUserModel> userModels = teacherDao.queryTeacherImModel(teacherIds);
|
|
|
userModels.forEach(e->{
|
|
|
- if(musicGroup.getTeamTeacherId() != null && Integer.parseInt(e.getId()) == musicGroup.getTeamTeacherId()){
|
|
|
- e.setTitle("运营主管");
|
|
|
- }else if(musicGroup.getEducationalTeacherId() != null && Integer.parseInt(e.getId()) == musicGroup.getEducationalTeacherId()){
|
|
|
+ if(musicGroup != null){
|
|
|
+ if(musicGroup.getTeamTeacherId() != null && Integer.parseInt(e.getId()) == musicGroup.getTeamTeacherId()){
|
|
|
+ e.setTitle("运营主管");
|
|
|
+ }else if(musicGroup.getEducationalTeacherId() != null && Integer.parseInt(e.getId()) == musicGroup.getEducationalTeacherId()){
|
|
|
e.setTitle("教务老师");
|
|
|
- }else if(musicGroup.getDirectorUserId() != null && Integer.parseInt(e.getId()) == musicGroup.getDirectorUserId()){
|
|
|
+ }else if(musicGroup.getDirectorUserId() != null && Integer.parseInt(e.getId()) == musicGroup.getDirectorUserId()){
|
|
|
e.setTitle("乐队指导");
|
|
|
+ }else {
|
|
|
+ e.setTitle("指导老师");
|
|
|
+ }
|
|
|
}else {
|
|
|
e.setTitle("指导老师");
|
|
|
}
|