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

mec-biz/src/main/java/com/ym/mec/biz/service/impl/TempLittleArtistTrainingCampServiceImpl.java

@@ -382,8 +382,12 @@ public class TempLittleArtistTrainingCampServiceImpl extends ServiceImpl<TempLit
         //获取学员分部、乐团列表
         Integer organId = user.getOrganId();
         musicGroupDao.queryUserMusicGroups(user.getId());
-        List<String> musicGroupIds = studentRegistrationDao.queryStudentMusicGroup(user.getId());
-        List<TempLittleArtistTrainingCamp> campList = this.baseMapper.findTrainingByStudent(organId,StringUtils.join(musicGroupIds,","),user.getId());
+        List<String> musicGroupIdList = studentRegistrationDao.queryStudentMusicGroup(user.getId());
+        String musicGroupIds = "";
+        if(CollectionUtils.isNotEmpty(musicGroupIdList)){
+            musicGroupIds = StringUtils.join(musicGroupIdList,",");
+        }
+        List<TempLittleArtistTrainingCamp> campList = this.baseMapper.findTrainingByStudent(organId,musicGroupIds,user.getId());
         //查询该学员是否购买过该训练营
         TempLittleArtistTrainingCampUserRelation userRelation = tempLittleArtistTrainingCampUserRelationService.getOne(Wrappers.<TempLittleArtistTrainingCampUserRelation>lambdaQuery()
                 .eq(TempLittleArtistTrainingCampUserRelation::getUserId, user.getId()));

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

@@ -236,6 +236,9 @@
         <if test="musicGroupIds != null and musicGroupIds != ''">
           (INTE_ARRAY(tlatc.music_group_ids_,#{musicGroupIds}) OR tlatc.music_group_ids_ IS NULL) AND
         </if>
+        <if test="musicGroupIds == null or musicGroupIds == ''">
+          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>