老师列表查询条件添加当前人所在分部

mec-education/src/main/java/com/ym/mec/education/service/impl/TeacherServiceImpl.java

@@ -83,6 +83,13 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherMapper, Teacher> impl
         PageResponse response = new PageResponse();
         QueryWrapper<SysUser> userQueryWrapper = new QueryWrapper<>();
         List<SysUser> userList = null;
+        if (Objects.isNull(req.getUserId())) {
+            return PageResponse.errorParam();
+        }
+        Teacher teacher = getById(req.getUserId());
+        if (Objects.isNull(teacher)) {
+            return PageResponse.noDataExists();
+        }
         if (req != null && StringUtils.isEmpty(req.getName())) {
             userQueryWrapper.like("real_name_", req.getName());
             userList = sysUserService.list(userQueryWrapper);
@@ -93,7 +100,8 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherMapper, Teacher> impl
             userIds = userList.stream().map(SysUser::getId).collect(Collectors.toList());
             queryWrapper.in("id_", userIds);
         }
-
+        Optional.ofNullable(teacher.getOrganId()).ifPresent(organId ->
+            queryWrapper.lambda().eq(Teacher::getOrganId, organId));
 
         IPage<Teacher> page = new Page(req.getPageNo() == null ? 1 : req.getPageNo(), req.getPageSize() == null ? 10 : req.getPageSize());
         IPage<Teacher> teacherIPage = this.page(page, queryWrapper);
@@ -325,7 +333,7 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherMapper, Teacher> impl
         Page<CourseSchedule> courseSchedulePage = new Page<CourseSchedule>(req.getPageNo(), req.getPageSize());
         QueryWrapper<CourseSchedule> courseScheduleQueryWrapper = new QueryWrapper<>();
         courseScheduleQueryWrapper.lambda().eq(CourseSchedule::getTeacherId, req.getUserId())
-        .eq(Objects.nonNull(req.getDate()), CourseSchedule::getClassDate, req.getDate());
+            .eq(Objects.nonNull(req.getDate()), CourseSchedule::getClassDate, req.getDate());
         IPage<CourseSchedule> page = courseScheduleService.page(courseSchedulePage, courseScheduleQueryWrapper);
         BeanUtils.copyProperties(page, pageResult);
         if (!CollectionUtils.isEmpty(page.getRecords())) {