|
|
@ -61,6 +61,7 @@ public class TeacherOpenCourseMergeStudentController{
|
|
|
|
PageQuery page = condition.getPageQuery();
|
|
|
|
PageQuery page = condition.getPageQuery();
|
|
|
|
if (coreUser.isStudent()) {
|
|
|
|
if (coreUser.isStudent()) {
|
|
|
|
condition.setStudentId(getStudent().getStudentId());
|
|
|
|
condition.setStudentId(getStudent().getStudentId());
|
|
|
|
|
|
|
|
condition.setTeacherOpenCourseSchoolClassMergeStudentStatus(1);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
teacherOpenCourseMergeStudentService.queryByConditionQuery(page);
|
|
|
|
teacherOpenCourseMergeStudentService.queryByConditionQuery(page);
|
|
|
|
return JsonResult.success(page);
|
|
|
|
return JsonResult.success(page);
|
|
|
|