Merge remote-tracking branch 'origin/master'

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

@@ -178,16 +178,16 @@
             <if test="courseEndDate != null">
                 AND cs.class_date_ &lt;= #{courseEndDate}
             </if>
-            <if test="signInStatus != null and signInStatus != 3">
+            <if test="signInStatus != null and signInStatus != '' and signInStatus != 3">
                 AND ta.sign_in_status_ = #{signInStatus}
             </if>
-            <if test="signOutStatus != null and signOutStatus != 3">
+            <if test="signOutStatus != null and signOutStatus != '' and signOutStatus != 3">
                 AND ta.sign_out_status_ = #{signOutStatus}
             </if>
-            <if test="signOutStatus != null and signOutStatus == 3">
+            <if test="signOutStatus != null and signOutStatus != '' and signOutStatus == 3">
                 AND ta.sign_out_status_ IS NULL
             </if>
-            <if test="signInStatus != null and signInStatus == 3">
+            <if test="signInStatus != null and signInStatus != '' and signInStatus == 3">
                 AND ta.sign_in_status_ IS NULL
             </if>
             <if test="courseScheduleType != null">