diff --git a/src/views/teacherEnd/student/index.vue b/src/views/teacherEnd/student/index.vue index a21ed82..fd6dd0e 100644 --- a/src/views/teacherEnd/student/index.vue +++ b/src/views/teacherEnd/student/index.vue @@ -440,7 +440,7 @@ const getClassList = () => { }); }; const selectDefaultStudentClass = () => { - if (!isManagerTeacher.value && !paramsquery.value.schoolClassId) { + if (!paramsquery.value.schoolClassId) { const ownTeachingClass = teachingClassOptions.value.find((schoolClass) => sameValue(schoolClass.createdBy, currentUserId.value)); paramsquery.value.schoolClassId = ownTeachingClass?.schoolClassId || ""; } diff --git a/tests/teacher-owned-student-management.static.test.cjs b/tests/teacher-owned-student-management.static.test.cjs index 1d06d99..e214d3d 100644 --- a/tests/teacher-owned-student-management.static.test.cjs +++ b/tests/teacher-owned-student-management.static.test.cjs @@ -10,7 +10,8 @@ assert(page.includes("const isManagerTeacher = computed(() => userStore.userInfo assert(page.includes("const studentClassOptions = computed(() => teachingClassOptions.value);"), "学生筛选下拉框必须只展示教学班"); assert(page.includes("isManagerTeacher.value || sameValue(schoolClass.createdBy, currentUserId.value)"), "教师管理员必须可查看本校全部教学班"); assert(page.includes(".sort((left, right) => classCreateTime(left) - classCreateTime(right))"), "普通教师的班级选项必须按创建时间升序排列"); -assert(page.includes("if (!isManagerTeacher.value && !paramsquery.value.schoolClassId)"), "普通教师必须默认选择自己的教学班"); +assert(page.includes("if (!paramsquery.value.schoolClassId)"), "教师管理员与普通教师都必须优先默认选择自己的教学班"); +assert(!page.includes("if (!isManagerTeacher.value && !paramsquery.value.schoolClassId)"), "教师管理员不应被排除在默认选择本人班级的规则之外"); assert(page.includes("const ownTeachingClass = teachingClassOptions.value.find((schoolClass) => sameValue(schoolClass.createdBy, currentUserId.value));"), "默认班级必须按创建人匹配当前教师"); assert(page.includes('paramsquery.value.schoolClassId = ownTeachingClass?.schoolClassId || "";'), "没有本人创建的班级时,默认值必须保持为空"); assert(/await getClassList\(\);\r?\n\s*selectDefaultStudentClass\(\);\r?\n\s*getList\(\);/.test(page), "学生列表必须在默认班级确定后查询");