This commit is contained in:
joshen@zcwytd.com
2023-11-24 17:33:17 +08:00
parent 02c02c44cf
commit 0b42013330
3 changed files with 13 additions and 5 deletions

View File

@@ -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查询报名的课程
List<String>courseId=IStudyCourseService.getCourseId(dto.getUserId());
String courseIds = String.join(",", courseId);
List<StudyCourse> courseList = IStudyCourseService.getCourseId(dto.getUserId());
String courseIds = "";
if (!Objects.isNull(courseList) && courseList.size() > 0){
List<String> 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) {

View File

@@ -104,5 +104,5 @@ public interface IStudyCourseService {
List<CourseStudyItem> findByCourseAndUsers(String courseId,List<String> aids) throws Exception;
List<String> getCourseId(String userId);
List<StudyCourse> getCourseId(String userId);
}

View File

@@ -708,8 +708,9 @@ public class StudyCourseServiceImpl implements IStudyCourseService{
}
@Override
public List<String> getCourseId(String userId) {
return studyCourseDao.findList(FieldFilters.eq("aid", userId)).stream().map(StudyCourse::getCourseId).collect(Collectors.toList());
public List<StudyCourse> 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