Merge branch 'saas_2022_05_17_activity' into master_saas

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

@@ -295,15 +295,14 @@ public class TempLittleArtistTrainingCampServiceImpl extends ServiceImpl<TempLit
         Map<String, Object> result = new HashMap<>();
         result.put("user", userRelation);
         if (CollectionUtils.isNotEmpty(campList)) {
-            campList.sort(Comparator.comparing(TempLittleArtistTrainingCamp::getApplyStartDate));
-        }
-        if (CollectionUtils.isNotEmpty(campList)) {
-            campList.forEach(a -> {
-                int count = tempLittleArtistTrainingCampUserRelationService.count(Wrappers.<TempLittleArtistTrainingCampUserRelation>lambdaQuery()
-                        .eq(TempLittleArtistTrainingCampUserRelation::getActivityId, a.getId())
-                );
-                a.setUserCount(count);
-            });
+            campList = campList.stream()
+                    .peek(a -> {
+                        int count = tempLittleArtistTrainingCampUserRelationService.count(Wrappers.<TempLittleArtistTrainingCampUserRelation>lambdaQuery()
+                                .eq(TempLittleArtistTrainingCampUserRelation::getActivityId, a.getId()));
+                        a.setUserCount(count);
+                    })
+                    .sorted(Comparator.comparing(TempLittleArtistTrainingCamp::getApplyStartDate))
+                    .collect(Collectors.toList());
         }
         result.put("campList", campList);
         return result;

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

@@ -50,6 +50,11 @@ public class TempLittleArtistTrainingCampUserRelationServiceImpl extends Service
     @Override
     public void add(Integer campId) {
         SysUser user = getUser();
+        TempLittleArtistTrainingCampUserRelation one = this.getOne(Wrappers.<TempLittleArtistTrainingCampUserRelation>lambdaQuery()
+                .eq(TempLittleArtistTrainingCampUserRelation::getUserId, user.getId()));
+        if (Objects.nonNull(one)) {
+            throw new BizException("您已登记训练营!");
+        }
         int count = this.count(Wrappers.<TempLittleArtistTrainingCampUserRelation>lambdaUpdate()
                 .set(TempLittleArtistTrainingCampUserRelation::getActivityId, campId));
         if (count == 2000) {