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

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

@@ -566,9 +566,7 @@
         FROM student stu
           LEFT JOIN sys_user su ON stu.user_id_=su.id_
         WHERE service_tag_=1 AND su.del_flag_=0
-        <if test="tenantId != null">
-        and tenant_id_ = #{tenantId}
-        </if>
+        and stu.tenant_id_ = #{tenantId}
     </select>
     <select id="getServeStudentCourseStartTimes" resultType="com.ym.mec.biz.dal.dto.StudentServeCourseDto">
         SELECT

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

@@ -107,7 +107,7 @@
 		<where>
 			tenant_id_ = #{tenantId}
 			<if test="userId!=null">
-				user_id_=#{userId}
+				and user_id_=#{userId}
 			</if>
 		</where>
 	</sql>