diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseFullTextApi.java b/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseFullTextApi.java index d7c6fdf1..3c1ab591 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseFullTextApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseFullTextApi.java @@ -7,6 +7,7 @@ import java.util.Objects; import java.util.stream.Collectors; import com.xboe.api.ThirdApi; +import com.xboe.school.study.entity.StudyCourse; import com.xboe.school.study.service.IStudyCourseService; import com.xboe.system.organization.service.IOrganizationService; import org.apache.commons.lang3.StringUtils; @@ -227,8 +228,14 @@ public class CourseFullTextApi extends ApiBaseController{ } // String offCourseIds="123.311"; //根据userId查询报名的课程 - ListcourseId=IStudyCourseService.getCourseId(dto.getUserId()); - String courseIds = String.join(",", courseId); + List courseList = IStudyCourseService.getCourseId(dto.getUserId()); + + String courseIds = ""; + if (!Objects.isNull(courseList) && courseList.size() > 0){ + List courseIdList = courseList.stream().map(StudyCourse::getCourseId).collect(Collectors.toList()); + courseIds = String.join(",", courseIdList); + } +// String courseIds = String.join(",", courseId); //只是查询已发布的 dto.setPublish(true); if(this.fullTextSearch==null) { diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/IStudyCourseService.java b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/IStudyCourseService.java index 9feb60ad..48aa73be 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/IStudyCourseService.java +++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/IStudyCourseService.java @@ -104,5 +104,5 @@ public interface IStudyCourseService { List findByCourseAndUsers(String courseId,List aids) throws Exception; - List getCourseId(String userId); + List getCourseId(String userId); } \ No newline at end of file diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyCourseServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyCourseServiceImpl.java index 723b6d26..a7c0d7f6 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyCourseServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyCourseServiceImpl.java @@ -708,8 +708,9 @@ public class StudyCourseServiceImpl implements IStudyCourseService{ } @Override - public List getCourseId(String userId) { - return studyCourseDao.findList(FieldFilters.eq("aid", userId)).stream().map(StudyCourse::getCourseId).collect(Collectors.toList()); + public List getCourseId(String userId) { + return studyCourseDao.findList(FieldFilters.eq("aid", userId)); +// return studyCourseDao.findList(FieldFilters.eq("aid", userId)).stream().map(StudyCourse::getCourseId).collect(Collectors.toList()); } @Override