Merge remote-tracking branch 'origin/master'

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

@@ -928,13 +928,13 @@
         <where>
             <if test="search != null">
                 AND (cg.name_ LIKE CONCAT('%',#{search},'%') OR cg.id_ = #{search}
-                <if test="groups != null">
+                <if test="groups != null and organIdList==null">
                     OR cg.music_group_id_ IN
                     <foreach collection="groups" item="group" open="(" close=")" separator=",">
                         #{group.id}
                     </foreach>
                 </if>
-                <if test="classGroupIds != null">
+                <if test="classGroupIds != null and organIdList==null">
                     OR cg.id_ IN
                     <foreach collection="classGroupIds" item="classGroupId" open="(" close=")" separator=",">
                         #{classGroupId}
@@ -942,6 +942,18 @@
                 </if>
                 )
             </if>
+            <if test="groups != null and organIdList!=null">
+                AND cg.music_group_id_ IN
+                <foreach collection="groups" item="group" open="(" close=")" separator=",">
+                    #{group.id}
+                </foreach>
+            </if>
+            <if test="classGroupIds != null and organIdList!=null">
+                AND cg.id_ IN
+                <foreach collection="classGroupIds" item="classGroupId" open="(" close=")" separator=",">
+                    #{classGroupId}
+                </foreach>
+            </if>
             <if test="groupType != null">
                 AND cg.group_type_=#{groupType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
             </if>

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

@@ -1923,7 +1923,7 @@
             cs.type_,
             cs.schoole_id_,
             cg.name_ class_group_name_,
-            s.name_ schoole_name_,
+            s.name_ schoole_name_
         FROM
           course_schedule cs
           LEFT JOIN class_group cg ON cg.id_=cs.class_group_id_