课后作业布置评测过滤

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentExtracurricularExercisesSituationServiceImpl.java

@@ -841,11 +841,13 @@ public class StudentExtracurricularExercisesSituationServiceImpl extends BaseSer
                     }
                 }
 
-                // 设置老师信息
-                SysUser sysUser = sysUserFeignService.queryUserById(courseHomeworkList.getTeacherId());
-                if (Objects.nonNull(sysUser)) {
-                    courseHomeworkList.setTeacherName(sysUser.getUsername());
-                    courseHomeworkList.setTeacherImg(sysUser.getAvatar());
+                if (courseHomeworkList.getTeacherId() != null) {
+                    // 设置老师信息
+                    SysUser sysUser = sysUserFeignService.queryUserById(courseHomeworkList.getTeacherId());
+                    if (Objects.nonNull(sysUser)) {
+                        courseHomeworkList.setTeacherName(sysUser.getUsername());
+                        courseHomeworkList.setTeacherImg(sysUser.getAvatar());
+                    }
                 }
             }
 

mec-biz/src/main/resources/config/mybatis/StudentExtracurricularExercisesSituationMapper.xml

@@ -835,11 +835,12 @@
         FROM course_schedule_teacher_salary csts
                  LEFT JOIN course_schedule cs ON cs.id_ = csts.course_schedule_id_
                  LEFT JOIN student_extracurricular_exercises_situation_ se ON se.teacher_id_ = csts.user_id_
+        left join lesson_examination le on le.course_schedule_id_ = csts.course_schedule_id_
         WHERE csts.user_id_ = #{teacherId}
         <if test="firstDayOfMonth != null and lastDayOfMonth != null">
             AND cs.class_date_ BETWEEN #{firstDayOfMonth} AND #{lastDayOfMonth}
         </if>
-          AND FIND_IN_SET(cs.id_, se.course_ids_)
+          AND FIND_IN_SET(cs.id_, se.course_ids_) and le.id_ is null
           AND se.serve_type_ = 'HOMEWORK'
     </select>