|
@@ -24,6 +24,7 @@ import com.ym.mec.common.page.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.web.bind.annotation.*;
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
@@ -88,7 +89,9 @@ public class LessonCoursewareController extends BaseController {
|
|
|
query1.setUserType(ClientEnum.TEACHER);
|
|
|
query1.setTenantCategoriesIdList(categoryIdList);
|
|
|
courseScheduleCoursewareDetails.forEach(e->lessonCoursewareService.setTreeResourceId(e.getKnowledgePointList(),query1));
|
|
|
- courseScheduleCoursewareDetails.removeIf(courseScheduleCoursewareDetail -> !filterAndUpdateKnowledgePointList(courseScheduleCoursewareDetail, search));
|
|
|
+ if(StringUtils.isNotEmpty(search)){
|
|
|
+ courseScheduleCoursewareDetails.removeIf(courseScheduleCoursewareDetail -> !filterAndUpdateKnowledgePointList(courseScheduleCoursewareDetail, search));
|
|
|
+ }
|
|
|
String jsonString = JSONObject.toJSONString(courseScheduleCoursewareDetails);
|
|
|
List<LessonCoursewareWrapper.CourseScheduleCoursewareDetail> courseScheduleCoursewareDetailList =
|
|
|
JSONObject.parseArray(jsonString, LessonCoursewareWrapper.CourseScheduleCoursewareDetail.class);
|