Merge remote-tracking branch 'origin/bjcz_his_scrm' into bjcz_his_scrm

fs-admin/src/main/java/com/fs/course/controller/FsUserCourseTrainingCampController.java

@@ -30,6 +30,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
 import java.util.*;
+import java.util.stream.Collectors;
 
 @RestController
 @RequestMapping("/course/trainingCamp")
@@ -173,16 +174,10 @@ public class FsUserCourseTrainingCampController {
                 params.put("scs", SortUtils.parseSort("order_number(desc),training_camp_id(desc)"));
                 if (needBindUser) params.put("userIds", userId);
                 List<FsUserCourseTrainingCampVO> fsUserCourseTrainingCampList= fsUserCourseTrainingCampService.selectFsUserCourseTrainingCampVOListByMap(params);
-                fsUserCourseTrainingCampList.stream().filter(camp -> !Objects.equals(camp.getTrainingCampId(), periodId))
-                        .forEach(camp -> {
-                            FsUserCoursePeriod query = new FsUserCoursePeriod();
-                            query.setTrainingCampId(camp.getTrainingCampId());
-                            List<FsUserCoursePeriodVO> periods = fsUserCoursePeriodService.selectFsUserCoursePeriodPage(query);
-                            if (periods != null && !periods.isEmpty()) {
-                                resultList.addAll(periods);
-                            }
-                        });
-                return R.ok().put("resultList", resultList);
+                fsUserCourseTrainingCampList = fsUserCourseTrainingCampList.stream()
+                        .filter(camp -> !Objects.equals(camp.getTrainingCampId(), periodId))
+                        .collect(Collectors.toList());
+                return R.ok().put("resultList", fsUserCourseTrainingCampList);
             } else if ("3".equals(campPeriodType)) {
                 // 新建训练营
                 if (StringUtils.isEmpty(campPeriodName)) {