Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/service/impl/CourseScheduleServiceImpl.java

@@ -5158,14 +5158,14 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 				preAuditDetailDto.setTeacherName(actualTeacherMap.get(preAuditDetailDto.getTeacherId()));
 				preAuditDetailDto.setActualTeacherName(actualTeacherMap.get(preAuditDetailDto.getActualTeacherId()));
 				preAuditDetailDto.setSchoolName(schoolMap.get(preAuditDetailDto.getSchoolId()));
-				preAuditDetailDto.setOperatorName(actualTeacherMap.get(preAuditDetailDto.getOperatorId()));
+				preAuditDetailDto.setOperatorName(actualTeacherMap.get(modifyLog.getOperatorId()));
 				modifyLog.setPreviousCourseSchedule(JSONObject.toJSONString(preAuditDetailDto));
 
 				CourseScheduleAuditDetailDto auditDetailDto = JSON.parseObject(modifyLog.getCurrentCourseSchedule(), CourseScheduleAuditDetailDto.class);
 				auditDetailDto.setTeacherName(actualTeacherMap.get(auditDetailDto.getTeacherId()));
 				auditDetailDto.setActualTeacherName(actualTeacherMap.get(auditDetailDto.getActualTeacherId()));
 				auditDetailDto.setSchoolName(schoolMap.get(auditDetailDto.getSchoolId()));
-				auditDetailDto.setOperatorName(actualTeacherMap.get(auditDetailDto.getOperatorId()));
+				auditDetailDto.setOperatorName(actualTeacherMap.get(modifyLog.getOperatorId()));
 				modifyLog.setCurrentCourseSchedule(JSONObject.toJSONString(auditDetailDto));
 			}
 			return scheduleModifyLogs;