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

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

@@ -383,8 +383,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()));