diff --git a/src/main/java/cn/teammodel/controller/admin/service/impl/TeacherServiceImpl.java b/src/main/java/cn/teammodel/controller/admin/service/impl/TeacherServiceImpl.java index 74a7d8a..8475549 100644 --- a/src/main/java/cn/teammodel/controller/admin/service/impl/TeacherServiceImpl.java +++ b/src/main/java/cn/teammodel/controller/admin/service/impl/TeacherServiceImpl.java @@ -213,6 +213,10 @@ public class TeacherServiceImpl implements TeacherService { if (teacherInfos != null) { //转换为GpTeacherVo对象数组 teachers = convertToGpTeacherVoList(teacherInfos, teacherDto.getCode()); + //过滤掉status为delete的数据 + teachers = teachers.stream() + .filter(t -> !t.getStatus().equals("delete")) + .collect(Collectors.toList()); } return teachers; }catch(Exception ex){ @@ -1790,7 +1794,7 @@ public class TeacherServiceImpl implements TeacherService { List schoolTeachers = new ArrayList<>(); for (GpTeacherVo teacher : gpTeacherRequest.getGpTeacherDtos()) { //处理新加入的学校教师 - String code = String.format(PK.TEACHER, teacher.getCode()); + String code = String.format(PK.TEACHER, schoolCode); SchoolTeacher schoolTeacher = new SchoolTeacher(); schoolTeacher.setName(teacher.getName()); schoolTeacher.setPicture(teacher.getPicture());