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

@@ -16,6 +16,7 @@ import com.yonge.toolset.base.page.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -77,8 +78,10 @@ public class TenantAlbumSheetController extends BaseController {
         if (CollectionUtils.isNotEmpty(courseScheduleCoursewareDetails)) {
             //过滤酷乐秀相关的权限
             courseScheduleCoursewareDetails.forEach(tenantAlbumMusicService::filterLessonCourseDetail);
-            //剔除空数据
-            courseScheduleCoursewareDetails.forEach(e->tenantAlbumMusicService.filterAndUpdateKnowledgePointList(e, search));
+            if(StringUtils.isNotEmpty(search)){
+                //剔除空数据
+                courseScheduleCoursewareDetails.forEach(e->tenantAlbumMusicService.filterAndUpdateKnowledgePointList(e, search));
+            }
             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

@@ -23,6 +23,7 @@ import com.yonge.toolset.mybatis.support.PageUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.http.HttpStatus;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -126,8 +127,10 @@ public class TenantAlbumSheetController extends BaseController {
         if (CollectionUtils.isNotEmpty(courseScheduleCoursewareDetails)) {
             //过滤酷乐秀相关的权限
             courseScheduleCoursewareDetails.forEach(tenantAlbumMusicService::filterLessonCourseDetail);
-            //剔除空数据
-            courseScheduleCoursewareDetails.forEach(e->tenantAlbumMusicService.filterAndUpdateKnowledgePointList(e, search));
+            if(StringUtils.isNotEmpty(search)){
+                //剔除空数据
+                courseScheduleCoursewareDetails.forEach(e->tenantAlbumMusicService.filterAndUpdateKnowledgePointList(e, search));
+            }
             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

@@ -22,6 +22,7 @@ import com.yonge.toolset.mybatis.support.PageUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.http.HttpStatus;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -115,8 +116,10 @@ public class TenantAlbumSheetController extends BaseController {
         if (CollectionUtils.isNotEmpty(courseScheduleCoursewareDetails)) {
             //过滤酷乐秀相关的权限
             courseScheduleCoursewareDetails.forEach(tenantAlbumMusicService::filterLessonCourseDetail);
-            //剔除空数据
-            courseScheduleCoursewareDetails.forEach(e->tenantAlbumMusicService.filterAndUpdateKnowledgePointList(e, search));
+            if(StringUtils.isNotEmpty(search)){
+                //剔除空数据
+                courseScheduleCoursewareDetails.forEach(e->tenantAlbumMusicService.filterAndUpdateKnowledgePointList(e, search));
+            }
             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

@@ -19,6 +19,7 @@ import com.yonge.toolset.mybatis.support.PageUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.http.HttpStatus;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -104,8 +105,10 @@ public class TenantAlbumSheetController extends BaseController {
         if (CollectionUtils.isNotEmpty(courseScheduleCoursewareDetails)) {
             //过滤酷乐秀相关的权限
             courseScheduleCoursewareDetails.forEach(tenantAlbumMusicService::filterLessonCourseDetail);
-            //剔除空数据
-            courseScheduleCoursewareDetails.forEach(e->tenantAlbumMusicService.filterAndUpdateKnowledgePointList(e, search));
+            if(StringUtils.isNotEmpty(search)){
+                //剔除空数据
+                courseScheduleCoursewareDetails.forEach(e->tenantAlbumMusicService.filterAndUpdateKnowledgePointList(e, search));
+            }
             String jsonString = JSONObject.toJSONString(courseScheduleCoursewareDetails);
             List<LessonCoursewareWrapper.CourseScheduleCoursewareDetail> courseScheduleCoursewareDetailList = JSONObject
                 .parseArray(jsonString, LessonCoursewareWrapper.CourseScheduleCoursewareDetail.class);