From 6f877a3f1f23250e72234a2e8dfe91f8636e4f7f Mon Sep 17 00:00:00 2001
From: Mlxa0324 <mlx950324@163.com>
Date: Fri, 30 Dec 2022 15:14:18 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AD=BE=E5=88=B0=E6=97=A5=E5=BF=97=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/sql/jlw/teacherOpenCourseMergeStudent.md | 3 +++
 .../js/jlw/teacherOpenCourseStudentSigninLog/index.js       | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/web/src/main/resources/sql/jlw/teacherOpenCourseMergeStudent.md b/web/src/main/resources/sql/jlw/teacherOpenCourseMergeStudent.md
index ec86c417..c36fd87f 100644
--- a/web/src/main/resources/sql/jlw/teacherOpenCourseMergeStudent.md
+++ b/web/src/main/resources/sql/jlw/teacherOpenCourseMergeStudent.md
@@ -59,6 +59,9 @@ queryByCondition
   @if(!isEmpty(userIdPlural)){
   and find_in_set(t.user_id,#userIdPlural#)
   @}
+  @if(!isEmpty(schoolClassIdPlural)){
+  and find_in_set(ta.class_id, #schoolClassIdPlural#)
+  @}
 
 
 queryByConditionQuery
diff --git a/web/src/main/resources/static/js/jlw/teacherOpenCourseStudentSigninLog/index.js b/web/src/main/resources/static/js/jlw/teacherOpenCourseStudentSigninLog/index.js
index 75b4c79a..817a8d39 100644
--- a/web/src/main/resources/static/js/jlw/teacherOpenCourseStudentSigninLog/index.js
+++ b/web/src/main/resources/static/js/jlw/teacherOpenCourseStudentSigninLog/index.js
@@ -275,9 +275,9 @@ layui.define([ 'form', 'laydate', 'table','laytpl'], function(exports) {
     function getParam_s(){
         var param = {
         "teacherOpenCourseStudentSigninSettingSessionTime":$("select[name='teacherOpenCourseStudentSigninSettingSessionTime']").val(),
-        "classId":$("#studentForm select[name='classId']").val(),
-            "studentSnOrName":$("#studentForm input[name='studentOrName']").val(),
-            'teacherOpenCourseId':teacherOpenCourseId
+        "schoolClassIdPlural":$("#studentForm select[name='classId']").val(),
+        "studentSnOrName":$("#studentForm input[name='studentOrName']").val(),
+        'teacherOpenCourseId':teacherOpenCourseId
         };
 
         return param