Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/dal/page/EndCourseScheduleQueryInfo.java

@@ -91,6 +91,16 @@ public class EndCourseScheduleQueryInfo extends QueryInfo {
 
     private Boolean hasDealTime;
 
+    private Integer educationUserId;
+
+    public Integer getEducationUserId() {
+        return educationUserId;
+    }
+
+    public void setEducationUserId(Integer educationUserId) {
+        this.educationUserId = educationUserId;
+    }
+
     public Boolean getHasDealTime() {
         return hasDealTime;
     }

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

@@ -557,6 +557,9 @@
 			<if test="hasDealTime!=null and !hasDealTime">
 				AND irdr.deal_time_ IS NULL
 			</if>
+			<if test="educationUserId!=null">
+				AND irdr.deal_user_id_ = #{educationUserId}
+			</if>
 			<if test="mergeCourseType != null and mergeCourseType != ''">
 				<if test="mergeCourseType == 'MASTER'">
 					AND cs.new_course_id_ = cs.id_