Explorar o código

feat:课表列表新增调整

Joburgess %!s(int64=4) %!d(string=hai) anos
pai
achega
31565236a0

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

@@ -2971,7 +2971,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 			Set<Integer> allTeacherIds = cstss.stream().map(CourseScheduleTeacherSalary::getUserId).collect(Collectors.toSet());
 			List<SimpleUserDto> teachers = teacherDao.getUsersSimpleInfo(new ArrayList<>(allTeacherIds));
 			Map<Integer, String> idNameMap = new HashMap<>();
-			if(CollectionUtils.isEmpty(teachers)){
+			if(!CollectionUtils.isEmpty(teachers)){
 				idNameMap = teachers.stream().collect(Collectors.toMap(SimpleUserDto::getUserId, s->s.getRealName(), (s1, s2)->s1));
 			}
 			//获取班级声部名称
@@ -2989,7 +2989,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 			for (CourseSchedule oldCours : oldCourses) {
 				CourseScheduleEndDto courseEnd = new CourseScheduleEndDto();
 				BeanUtils.copyProperties(oldCours, courseEnd);
-				courseEnd.setTeacherName(idNameMap.get(oldCours.getId()));
+				courseEnd.setTeacherName(idNameMap.get(oldCours.getActualTeacherId()));
 				if(courseTeachTypeTeacherIdsMap.containsKey(oldCours.getId())){
 					Set<Integer> teacherIds = courseTeachTypeTeacherIdsMap.get(oldCours.getId());
 					Set<String> teacherNames = new HashSet<>();