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

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

@@ -122,6 +122,10 @@ public class TempLittleArtistTrainingCampServiceImpl extends ServiceImpl<TempLit
         entity.setTrainEndDate(dto.getTrainEndDate());
         entity.setPicUrl(dto.getPicUrl());
         entity.setEnableFlag(dto.getEnableFlag());
+        entity.setMusicGroupIds(dto.getMusicGroupIds());
+        entity.setOrganIds(dto.getOrganIds());
+        entity.setSignStandard(dto.getSignStandard());
+        entity.setStandardDays(dto.getStandardDays());
         entity.setUpdateBy(user.getId());
         entity.setUpdateTime(new Date());
         this.updateById(entity);

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

@@ -66,9 +66,9 @@ public class TempLittleArtistTrainingCampUserRelationServiceImpl extends Service
         }
         TempLittleArtistTrainingCampUserRelation one = this.getOne(Wrappers.<TempLittleArtistTrainingCampUserRelation>lambdaQuery()
                 .eq(TempLittleArtistTrainingCampUserRelation::getUserId, user.getId())
-                .isNotNull(TempLittleArtistTrainingCampUserRelation::getActivityId));
-        if (Objects.nonNull(one) && one.getActivityId() != null) {
-            throw new BizException("您已登记训练营!");
+                .eq(TempLittleArtistTrainingCampUserRelation::getActivityId,campId));
+        if (Objects.nonNull(one)) {
+            throw new BizException("您已登记该训练营!");
         }
         int count = this.count(Wrappers.<TempLittleArtistTrainingCampUserRelation>lambdaUpdate()
                 .eq(TempLittleArtistTrainingCampUserRelation::getActivityId, campId));