|
@@ -146,7 +146,10 @@ public class StudentManagerController {
|
|
|
for (BaseStudentSchoolRollVo roll : userVo.getBaseStudentSchoolRollList()) {
|
|
for (BaseStudentSchoolRollVo roll : userVo.getBaseStudentSchoolRollList()) {
|
|
|
BaseClass aClass = baseClassService.getById(roll.getClassId());
|
|
BaseClass aClass = baseClassService.getById(roll.getClassId());
|
|
|
XjrUser xjrUser = xjrUserService.getById(aClass.getTeacherId());
|
|
XjrUser xjrUser = xjrUserService.getById(aClass.getTeacherId());
|
|
|
- roll.setTeacherName(xjrUser.getName());
|
|
|
|
|
|
|
+ if(xjrUser != null){
|
|
|
|
|
+ roll.setTeacherName(xjrUser.getName());
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
|
|
|
String roomName = roomBedService.getRoomNameByStudentUserId(roll.getUserId());
|
|
String roomName = roomBedService.getRoomNameByStudentUserId(roll.getUserId());
|
|
|
roll.setRoomName(roomName);
|
|
roll.setRoomName(roomName);
|