|
@@ -1924,13 +1924,13 @@
|
|
|
<where>
|
|
|
<if test="search != null">
|
|
|
AND (cs.name_ LIKE CONCAT('%',#{search},'%') OR cs.id_ = #{search}
|
|
|
- <if test="groups != null and groupId==null">
|
|
|
+ <if test="groups != null and organIdList==null">
|
|
|
OR cs.music_group_id_ IN
|
|
|
<foreach collection="groups" item="group" open="(" close=")" separator=",">
|
|
|
#{group.id}
|
|
|
</foreach>
|
|
|
</if>
|
|
|
- <if test="courseIds != null and groupId==null">
|
|
|
+ <if test="courseIds != null and organIdList==null">
|
|
|
OR cs.id_ IN
|
|
|
<foreach collection="courseIds" item="courseId" open="(" close=")" separator=",">
|
|
|
#{courseId}
|
|
@@ -1938,13 +1938,13 @@
|
|
|
</if>
|
|
|
)
|
|
|
</if>
|
|
|
- <if test="groups != null and groupId!=null">
|
|
|
+ <if test="groups != null and organIdList!=null">
|
|
|
AND cs.music_group_id_ IN
|
|
|
<foreach collection="groups" item="group" open="(" close=")" separator=",">
|
|
|
#{group.id}
|
|
|
</foreach>
|
|
|
</if>
|
|
|
- <if test="courseIds != null and groupId!=null">
|
|
|
+ <if test="courseIds != null and organIdList!=null">
|
|
|
AND cs.id_ IN
|
|
|
<foreach collection="courseIds" item="courseId" open="(" close=")" separator=",">
|
|
|
#{courseId}
|