|
@@ -99,7 +99,7 @@ public class RoomServiceImpl implements RoomService {
|
|
|
Teacher teacher = teacherDao.get(Integer.parseInt(userId));
|
|
|
CourseSchedule courseSchedule = courseScheduleDao.get(Long.parseLong(roomId));
|
|
|
try {
|
|
|
- if(teacher != null && teacher.getId() == courseSchedule.getActualTeacherId()){
|
|
|
+ if(teacher != null && teacher.getId().equals(courseSchedule.getActualTeacherId())){
|
|
|
teacherAttendanceService.addTeacherAttendanceRecord(Integer.parseInt(roomId),Integer.parseInt(userId), SignStatusEnum.SIGN_IN,true);
|
|
|
}else {
|
|
|
studentAttendanceService.addStudentAttendanceRecord(Integer.parseInt(roomId),Integer.parseInt(userId), StudentAttendanceStatusEnum.NORMAL);
|
|
@@ -148,7 +148,7 @@ public class RoomServiceImpl implements RoomService {
|
|
|
} else {
|
|
|
roleEnum = RoleEnum.RoleAudience;
|
|
|
}*/
|
|
|
- if(teacher != null && teacher.getId() == courseSchedule.getActualTeacherId()){
|
|
|
+ if(teacher != null && teacher.getId().equals(courseSchedule.getActualTeacherId())){
|
|
|
roleEnum = RoleEnum.RoleTeacher;
|
|
|
}else {
|
|
|
roleEnum = RoleEnum.RoleStudent;
|
|
@@ -244,7 +244,7 @@ public class RoomServiceImpl implements RoomService {
|
|
|
Teacher teacher = teacherDao.get(user.getId());
|
|
|
CourseSchedule courseSchedule = courseScheduleDao.get(Long.parseLong(roomId.substring(4)));
|
|
|
try {
|
|
|
- if(teacher != null && teacher.getId() == courseSchedule.getActualTeacherId()){
|
|
|
+ if(teacher != null && teacher.getId().equals(courseSchedule.getActualTeacherId())){
|
|
|
teacherAttendanceService.addTeacherAttendanceRecord(Integer.parseInt(roomId.substring(4)),user.getId(), SignStatusEnum.SIGN_OUT,true);
|
|
|
}
|
|
|
}catch (Exception e){
|
|
@@ -1141,7 +1141,7 @@ public class RoomServiceImpl implements RoomService {
|
|
|
Teacher teacher = teacherDao.get(sysUser.getId());
|
|
|
CourseSchedule courseSchedule = courseScheduleDao.get(Long.parseLong(roomId));
|
|
|
try {
|
|
|
- if(teacher != null && teacher.getId() == courseSchedule.getActualTeacherId()){
|
|
|
+ if(teacher != null && teacher.getId().equals(courseSchedule.getActualTeacherId())){
|
|
|
teacherAttendanceService.addTeacherAttendanceRecord(Integer.parseInt(roomId.substring(4)),Integer.parseInt(userId), SignStatusEnum.SIGN_OUT,true);
|
|
|
}
|
|
|
}catch (Exception e){
|