diff --git a/web/src/main/java/com/ibeetl/jlw/service/HandsOnService.java b/web/src/main/java/com/ibeetl/jlw/service/HandsOnService.java
index b36bc8ba..76969a88 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/HandsOnService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/HandsOnService.java
@@ -26,6 +26,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -209,6 +210,9 @@ public class HandsOnService extends CoreBaseService<HandsOn>{
     }
 
     public List<HandsOn> getByCourseInfoIds(List<Long> courseInfoIdList) {
+        if (CollectionUtils.isEmpty(courseInfoIdList)) {
+            return Collections.emptyList();
+        }
         return handsOnDao.createLambdaQuery()
                 .andIn(HandsOn::getCourseInfoId, courseInfoIdList)
                 .andEq(HandsOn::getHandsOnStatus, 1)
diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeStudentService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeStudentService.java
index cf1dea41..a1c41a9c 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeStudentService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeStudentService.java
@@ -2,6 +2,7 @@ package com.ibeetl.jlw.service;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.ObjectUtil;
 import cn.jlw.util.ToolUtils;
 import cn.jlw.validate.ValidateConfig;
 import com.alibaba.fastjson.JSON;
@@ -72,8 +73,22 @@ public class TeacherOpenCourseMergeStudentService extends CoreBaseService<Teache
         return ret;
     }
 
-    public PageQuery<TeacherOpenCourseMergeStudent> queryByConditionQuery(PageQuery query) {
+    public PageQuery<TeacherOpenCourseMergeStudent> queryByConditionQuery(PageQuery query,CoreUser coreUser) {
         PageQuery ret = teacherOpenCourseMergeStudentDao.queryByConditionQuery(query);
+
+        if (coreUser.isStudent()){
+            List<TeacherOpenCourseMergeStudent> studentList = new ArrayList<>();
+            ret.getList().forEach(item ->{
+                TeacherOpenCourseMergeStudent student  = (TeacherOpenCourseMergeStudent) item;
+                TeacherOpenCourse teacherOpenCourseInfo = student.getTeacherOpenCourseInfo();
+                if (ObjectUtil.isNotEmpty(teacherOpenCourseInfo)){
+                    if (ObjectUtil.equals(teacherOpenCourseInfo.getTeacherOpenCourseStatus(),1)){
+                        studentList.add(student);
+                    }
+                }
+            });
+            ret.setList(studentList);
+        }
         queryListAfter(ret.getList());
         return ret;
     }
diff --git a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeStudentController.java b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeStudentController.java
index 5ac54287..5bd23889 100644
--- a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeStudentController.java
+++ b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeStudentController.java
@@ -63,7 +63,7 @@ public class TeacherOpenCourseMergeStudentController{
                 condition.setStudentId(getStudent().getStudentId());
                 condition.setTeacherOpenCourseSchoolClassMergeStudentStatus(1);
             }
-            teacherOpenCourseMergeStudentService.queryByConditionQuery(page);
+            teacherOpenCourseMergeStudentService.queryByConditionQuery(page,coreUser);
             return JsonResult.success(page);
         }
     }