去除根据当前登录人查询对应学员名单列表,根据学员id查询详情获取当前登陆人

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

@@ -7,8 +7,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.common.collect.Lists;
 import com.ym.mec.biz.dal.enums.JobTypeEnum;
 import com.ym.mec.common.enums.UserGenderEnum;
-import com.ym.mec.common.security.AuthUser;
-import com.ym.mec.common.security.SecurityUtils;
 import com.ym.mec.education.base.BaseResponse;
 import com.ym.mec.education.base.PageResponse;
 import com.ym.mec.education.entity.*;
@@ -24,7 +22,9 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -113,14 +113,10 @@ public class ClassGroupStudentMapperServiceImpl extends ServiceImpl<ClassGroupSt
 
     @Override
     public PageResponse getPageByTeacher(StudentReq studentReq) {
-        Teacher teacher;
-        //判断当前登录人角色
-        AuthUser user = SecurityUtils.getUser();
-        if(Objects.nonNull(user)) {
-            teacher = teacherService.getById(user.getUserId());
-        }else {
-            teacher = teacherService.getById(studentReq.getTeacherId());
+        if (Objects.isNull(studentReq.getTeacherId())) {
+            return PageResponse.errorParam();
         }
+        Teacher teacher = teacherService.getById(studentReq.getTeacherId());
         if (Objects.nonNull(teacher)) {
             //教学主管
             QueryWrapper<MusicGroup> musicGroupQueryWrapper = new QueryWrapper<>();

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

@@ -5,8 +5,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.common.collect.Lists;
-import com.ym.mec.common.security.AuthUser;
-import com.ym.mec.common.security.SecurityUtils;
 import com.ym.mec.education.base.BaseResponse;
 import com.ym.mec.education.base.PageResponse;
 import com.ym.mec.education.entity.*;
@@ -24,7 +22,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
-
 import java.util.*;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
@@ -320,22 +317,14 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherMapper, Teacher> impl
 
     @Override
     public PageResponse dailySchedule(TeacherReq req) {
-        AuthUser user = SecurityUtils.getUser();
-        Optional<AuthUser> optional = Optional.ofNullable(user);
         Page<TeacherDailyScheduleResp> pageResult = new Page<>();
-        Integer userId;
-        if (optional.isPresent()) {
-            userId = optional.get().getUserId();
-        } else {
-            if (Objects.isNull(req.getUserId())) {
-                return PageResponse.errorParam();
-            }
-            userId = req.getUserId();
+        if (Objects.isNull(req.getUserId())) {
+            return PageResponse.errorParam();
         }
         List<TeacherDailyScheduleResp> list = Lists.newArrayList();
         Page<CourseSchedule> courseSchedulePage = new Page<>(req.getPageNo(), req.getPageSize());
         QueryWrapper<CourseSchedule> courseScheduleQueryWrapper = new QueryWrapper<>();
-        courseScheduleQueryWrapper.lambda().eq(CourseSchedule::getTeacherId, userId)
+        courseScheduleQueryWrapper.lambda().eq(CourseSchedule::getTeacherId, req.getUserId())
             .eq(Objects.isNull(req.getDate()), CourseSchedule::getClassDate, req.getDate());
         IPage<CourseSchedule> page = courseScheduleService.page(courseSchedulePage, courseScheduleQueryWrapper);
         BeanUtils.copyProperties(page, pageResult);