Merge branch 'saas' of http://git.dayaedu.com/yonge/mec into master_saas

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

@@ -2180,15 +2180,12 @@
 		</if>
 	</select>
 	<select id="indexCoop" resultType="com.ym.mec.biz.dal.dto.DecimalMapDto">
-		SELECT cop.organ_name_ name,SUM(spo.expect_amount_) amount
-		FROM student_payment_order spo
-				 left join (select sr.user_id_,mg.cooperation_organ_id_ organ_id_,co.name_ organ_name_ from
-			(select * from student_registration where id_ IN (select MAX(id_) from student_registration group by user_id_)) sr
-				left join music_group mg ON mg.id_ = sr.music_group_id_
-				left join cooperation_organ co ON co.id_ = mg.cooperation_organ_id_
-							where mg.organ_id_ = #{organId} group by sr.user_id_,mg.cooperation_organ_id_) cop ON cop.user_id_ = spo.user_id_
-		WHERE spo.status_ = 'SUCCESS' AND DATE_FORMAT(spo.pay_time_,'%Y-%m-%d') BETWEEN #{startTime} AND #{endTime}
-		  AND cop.user_id_ = spo.user_id_
+		select cop.organ_name_ name,SUM(spo.expect_amount_) amount from (
+		select sr.user_id_,mg.cooperation_organ_id_ organ_id_,co.name_ organ_name_ from cooperation_organ co
+		left join music_group mg ON co.id_ = mg.cooperation_organ_id_
+		left join (select * from student_registration where id_ IN (select MAX(id_) from student_registration group by user_id_)) sr ON mg.id_ = sr.music_group_id_
+		where mg.organ_id_ = #{organId} AND co.is_enable_ group by sr.user_id_,mg.cooperation_organ_id_) cop
+		left join student_payment_order spo ON cop.user_id_ = spo.user_id_ AND spo.status_ = 'SUCCESS' AND DATE_FORMAT(spo.pay_time_,'%Y-%m-%d') BETWEEN #{startTime} AND #{endTime}
 		GROUP BY cop.organ_id_ order by amount DESC
 	</select>
 </mapper>

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

@@ -74,7 +74,7 @@
 	</update>
 	<sql id="queryPageSql">
 		<where>
-			ses.del_flag_ = 0 and ses.tenant_id_ = #{tenantId}
+			ses.del_flag_ = 0
 			<if test="search != null and search != ''">
 				AND (ses.id_ = #{search} OR ses.name_ LIKE CONCAT('%',#{search},'%'))
 			</if>