Merge remote-tracking branch 'origin/online1' into online1

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

@@ -312,6 +312,9 @@
             <if test="organId != null and organId != ''">
                 AND FIND_IN_SET(cs.organ_id_,#{organId})
             </if>
+            <if test="teacherId != null">
+                AND ta.teacher_id_ = #{teacherId}
+            </if>
             <if test="teacherAttendanceId != null and teacherAttendanceId != ''">
                 AND FIND_IN_SET(ta.id_,#{teacherAttendanceId})
             </if>