fix: GET /school/classes 班级列表关联教师已删除时不抛异常
- 新增 TeacherService.findTeacherById 教师不存在时返回 null - SchoolClassController 使用 findTeacherById 替代 getTeacherById Made-with: Cursor
This commit is contained in:
parent
0e77fae390
commit
212559fd9f
@ -94,7 +94,7 @@ public class SchoolClassController {
|
|||||||
new LambdaQueryWrapper<ClassTeacher>().eq(ClassTeacher::getClassId, vo.getId()));
|
new LambdaQueryWrapper<ClassTeacher>().eq(ClassTeacher::getClassId, vo.getId()));
|
||||||
List<ClassTeacherResponse> teacherList = new ArrayList<>();
|
List<ClassTeacherResponse> teacherList = new ArrayList<>();
|
||||||
for (ClassTeacher ct : classTeachers) {
|
for (ClassTeacher ct : classTeachers) {
|
||||||
Teacher t = teacherService.getTeacherById(ct.getTeacherId());
|
Teacher t = teacherService.findTeacherById(ct.getTeacherId());
|
||||||
teacherList.add(ClassTeacherResponse.builder()
|
teacherList.add(ClassTeacherResponse.builder()
|
||||||
.id(ct.getId())
|
.id(ct.getId())
|
||||||
.classId(ct.getClassId())
|
.classId(ct.getClassId())
|
||||||
@ -157,7 +157,7 @@ public class SchoolClassController {
|
|||||||
new LambdaQueryWrapper<ClassTeacher>().eq(ClassTeacher::getClassId, id));
|
new LambdaQueryWrapper<ClassTeacher>().eq(ClassTeacher::getClassId, id));
|
||||||
List<ClassTeacherResponse> teacherList = new ArrayList<>();
|
List<ClassTeacherResponse> teacherList = new ArrayList<>();
|
||||||
for (ClassTeacher ct : classTeachers) {
|
for (ClassTeacher ct : classTeachers) {
|
||||||
Teacher t = teacherService.getTeacherById(ct.getTeacherId());
|
Teacher t = teacherService.findTeacherById(ct.getTeacherId());
|
||||||
teacherList.add(ClassTeacherResponse.builder()
|
teacherList.add(ClassTeacherResponse.builder()
|
||||||
.id(ct.getId())
|
.id(ct.getId())
|
||||||
.classId(ct.getClassId())
|
.classId(ct.getClassId())
|
||||||
|
|||||||
@ -34,6 +34,11 @@ public interface TeacherService extends IService<Teacher> {
|
|||||||
*/
|
*/
|
||||||
Teacher getTeacherById(Long id);
|
Teacher getTeacherById(Long id);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 根据 ID 查询教师,不存在时返回 null(不抛异常)
|
||||||
|
*/
|
||||||
|
Teacher findTeacherById(Long id);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 根据 ID 查询教师(带租户验证)
|
* 根据 ID 查询教师(带租户验证)
|
||||||
*/
|
*/
|
||||||
|
|||||||
@ -160,6 +160,12 @@ public class TeacherServiceImpl extends com.baomidou.mybatisplus.extension.servi
|
|||||||
return teacher;
|
return teacher;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Teacher findTeacherById(Long id) {
|
||||||
|
if (id == null) return null;
|
||||||
|
return teacherMapper.selectById(id);
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Teacher getTeacherByIdWithTenantCheck(Long id, Long tenantId) {
|
public Teacher getTeacherByIdWithTenantCheck(Long id, Long tenantId) {
|
||||||
log.debug("查询教师(带租户验证),ID: {}, tenantId: {}", id, tenantId);
|
log.debug("查询教师(带租户验证),ID: {}, tenantId: {}", id, tenantId);
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user