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