Merge branch 'saas_2022_05_17_activity' into master_saas

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

@@ -451,9 +451,10 @@ public class TempLittleArtistTrainingCampServiceImpl extends ServiceImpl<TempLit
         if (Objects.isNull(campUser)) {
             return null;
         }
-        //查询训练营
+        //查询在训练中的训练营
         TempLittleArtistTrainingCamp camp = this.getOne(Wrappers.<TempLittleArtistTrainingCamp>lambdaQuery()
                 .eq(TempLittleArtistTrainingCamp::getId, campUser.getActivityId())
+                .eq(TempLittleArtistTrainingCamp::getState, TempLittleArtistTrainingCamp.ING)
                 .eq(TempLittleArtistTrainingCamp::getDelFlag, 0));
         if (Objects.isNull(camp)) {
             return null;