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

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

@@ -230,7 +230,7 @@
 		SELECT ch.id_,ch.create_time_,'HOMEWORK' type_ FROM course_homework ch
 		LEFT JOIN course_schedule_teacher_salary csts ON ch.course_schedule_id_ = csts.course_schedule_id_ AND csts.teacher_role_ = 'BISHOP'
 		<where>
-			tenant_id_ = #{tenantId}
+			csts.tenant_id_ = #{tenantId}
 			<if test="teacherId!=null">
 				AND csts.user_id_ = #{teacherId}
 			</if>
@@ -260,7 +260,7 @@
 		SELECT ch.id_,ch.create_time_,'HOMEWORK' type_ FROM course_homework ch
 		LEFT JOIN course_schedule_teacher_salary csts ON ch.course_schedule_id_ = csts.course_schedule_id_ AND csts.teacher_role_ = 'BISHOP'
 		<where>
-			tenant_id_ = #{tenantId}
+			csts.tenant_id_ = #{tenantId}
 			<if test="teacherId!=null">
 				AND csts.user_id_ = #{teacherId}
 			</if>

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

@@ -85,7 +85,7 @@
 
 	<sql id="StudentExtraCommentsQueryCondition">
 		<where>
-			tenant_id_ = #{tenantId}
+			eem.tenant_id_ = #{tenantId}
 			<if test="studentCourseHomeworkId!=null">
 				AND extracurricular_exercises_reply_id_=#{studentCourseHomeworkId}
 			</if>