Merge branch 'courseware_search_1211' of http://git.dayaedu.com/yonge/cooleshow into develop-new

cooleshow-app/src/main/java/com/yonge/cooleshow/admin/controller/TenantAlbumSheetController.java

@@ -79,7 +79,7 @@ public class TenantAlbumSheetController extends BaseController {
             //过滤酷乐秀相关的权限
             courseScheduleCoursewareDetails.forEach(tenantAlbumMusicService::filterLessonCourseDetail);
             //剔除空数据
-            courseScheduleCoursewareDetails.removeIf(tenantAlbumMusicService::filterAndUpdateKnowledgePointList);
+            courseScheduleCoursewareDetails.removeIf(e->!tenantAlbumMusicService.filterAndUpdateKnowledgePointList(e));
             String jsonString = JSONObject.toJSONString(courseScheduleCoursewareDetails);
             List<LessonCoursewareWrapper.CourseScheduleCoursewareDetail> courseScheduleCoursewareDetailList = JSONObject.parseArray(jsonString, LessonCoursewareWrapper.CourseScheduleCoursewareDetail.class);
             return succeed(courseScheduleCoursewareDetailList);

cooleshow-app/src/main/java/com/yonge/cooleshow/student/controller/TenantAlbumSheetController.java

@@ -127,7 +127,7 @@ public class TenantAlbumSheetController extends BaseController {
         if (CollectionUtils.isNotEmpty(courseScheduleCoursewareDetails)) {
             //过滤酷乐秀相关的权限
             courseScheduleCoursewareDetails.forEach(tenantAlbumMusicService::filterLessonCourseDetail);
-            courseScheduleCoursewareDetails.removeIf(tenantAlbumMusicService::filterAndUpdateKnowledgePointList);
+            courseScheduleCoursewareDetails.removeIf(e->!tenantAlbumMusicService.filterAndUpdateKnowledgePointList(e));
             String jsonString = JSONObject.toJSONString(courseScheduleCoursewareDetails);
             List<LessonCoursewareWrapper.CourseScheduleCoursewareDetail> courseScheduleCoursewareDetailList = JSONObject
                 .parseArray(jsonString, LessonCoursewareWrapper.CourseScheduleCoursewareDetail.class);

cooleshow-app/src/main/java/com/yonge/cooleshow/teacher/controller/TenantAlbumSheetController.java

@@ -116,7 +116,7 @@ public class TenantAlbumSheetController extends BaseController {
         if (CollectionUtils.isNotEmpty(courseScheduleCoursewareDetails)) {
             //过滤酷乐秀相关的权限
             courseScheduleCoursewareDetails.forEach(tenantAlbumMusicService::filterLessonCourseDetail);
-            courseScheduleCoursewareDetails.removeIf(tenantAlbumMusicService::filterAndUpdateKnowledgePointList);
+            courseScheduleCoursewareDetails.removeIf(e->!tenantAlbumMusicService.filterAndUpdateKnowledgePointList(e));
             String jsonString = JSONObject.toJSONString(courseScheduleCoursewareDetails);
             List<LessonCoursewareWrapper.CourseScheduleCoursewareDetail> courseScheduleCoursewareDetailList = JSONObject
                 .parseArray(jsonString, LessonCoursewareWrapper.CourseScheduleCoursewareDetail.class);

cooleshow-app/src/main/java/com/yonge/cooleshow/tenant/controller/TenantAlbumSheetController.java

@@ -105,7 +105,7 @@ public class TenantAlbumSheetController extends BaseController {
         if (CollectionUtils.isNotEmpty(courseScheduleCoursewareDetails)) {
             //过滤酷乐秀相关的权限
             courseScheduleCoursewareDetails.forEach(tenantAlbumMusicService::filterLessonCourseDetail);
-            courseScheduleCoursewareDetails.removeIf(tenantAlbumMusicService::filterAndUpdateKnowledgePointList);
+            courseScheduleCoursewareDetails.removeIf(e->!tenantAlbumMusicService.filterAndUpdateKnowledgePointList(e));
             String jsonString = JSONObject.toJSONString(courseScheduleCoursewareDetails);
             List<LessonCoursewareWrapper.CourseScheduleCoursewareDetail> courseScheduleCoursewareDetailList = JSONObject
                 .parseArray(jsonString, LessonCoursewareWrapper.CourseScheduleCoursewareDetail.class);