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

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

@@ -232,9 +232,12 @@
     <select id="findTrainingByStudent" resultType="com.ym.mec.biz.dal.entity.TempLittleArtistTrainingCamp">
         select tlatc.*,tlatcur.state_ status from temp_little_artist_training_camp tlatc
         left join temp_little_artist_training_camp_user_relation tlatcur ON tlatc.id_ = tlatcur.activity_id_ and tlatcur.user_id_ = #{userId}
-        where (INTE_ARRAY(tlatc.music_group_ids_,#{musicGroupIds}) OR tlatc.music_group_ids_ IS NULL) AND
-            (FIND_IN_SET(#{organId},tlatc.organ_ids_) OR tlatc.organ_ids_ IS NULL)
-          and tlatc.del_flag_ = 0 and tlatc.enable_flag_ = 1 order by id_ DESC
+        where
+        <if test="musicGroupIds != null and musicGroupIds != ''">
+          (INTE_ARRAY(tlatc.music_group_ids_,#{musicGroupIds}) OR tlatc.music_group_ids_ IS NULL) AND
+        </if>
+        (FIND_IN_SET(#{organId},tlatc.organ_ids_) OR tlatc.organ_ids_ IS NULL)
+        and tlatc.del_flag_ = 0 and tlatc.enable_flag_ = 1 order by id_ DESC
     </select>
 
     <update id="updateUserNum" parameterType="object">