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

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

@@ -1499,7 +1499,7 @@
 
     <sql id="queryClassGroupPageSql">
         <where>
-            cg.group_type_ = #{groupType} AND cg.del_flag_ = 0
+            cg.group_type_ = #{groupType} AND cg.del_flag_ = 0 AND cg.tenant_id_ = #{tenantId}
             <if test="type != null">
                 AND type_ = #{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
             </if>
@@ -1509,9 +1509,6 @@
             <if test="educationUserId != null">
                 AND mg.educational_teacher_id_ = #{educationUserId}
             </if>
-            <if test="tenant_id_  != null">
-                AND cg.tenant_id_ = #{tenantId}
-            </if>
             <if test="search != null and search != ''">
                 AND (cg.id_ LIKE CONCAT('%',#{search},'%') OR cg.name_ LIKE CONCAT('%',#{search},'%') OR mg.name_ LIKE CONCAT('%',#{search},'%') OR cg.music_group_id_ LIKE CONCAT('%',#{search},'%'))
             </if>

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

@@ -63,7 +63,7 @@
 	
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="HotWordsLabel" parameterType="map">
-		SELECT * FROM hot_words_label where tenant_id_ = #{tenantId} ORDER BY id_ <include refid="global.limit"/>
+		SELECT * FROM hot_words_label ORDER BY id_ <include refid="global.limit"/>
 	</select>
 	
 	<!-- 查询当前表的总记录数 -->