mirror of
https://codeup.aliyun.com/67762337eccfc218f6110e0e/per-boe/java-servers.git
synced 2025-12-09 02:46:50 +08:00
判空
This commit is contained in:
@@ -7,6 +7,7 @@ import java.util.Objects;
|
|||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
import com.xboe.api.ThirdApi;
|
import com.xboe.api.ThirdApi;
|
||||||
|
import com.xboe.school.study.entity.StudyCourse;
|
||||||
import com.xboe.school.study.service.IStudyCourseService;
|
import com.xboe.school.study.service.IStudyCourseService;
|
||||||
import com.xboe.system.organization.service.IOrganizationService;
|
import com.xboe.system.organization.service.IOrganizationService;
|
||||||
import org.apache.commons.lang3.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
@@ -227,8 +228,14 @@ public class CourseFullTextApi extends ApiBaseController{
|
|||||||
}
|
}
|
||||||
// String offCourseIds="123.311";
|
// String offCourseIds="123.311";
|
||||||
//根据userId查询报名的课程
|
//根据userId查询报名的课程
|
||||||
List<String>courseId=IStudyCourseService.getCourseId(dto.getUserId());
|
List<StudyCourse> courseList = IStudyCourseService.getCourseId(dto.getUserId());
|
||||||
String courseIds = String.join(",", courseId);
|
|
||||||
|
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);
|
dto.setPublish(true);
|
||||||
if(this.fullTextSearch==null) {
|
if(this.fullTextSearch==null) {
|
||||||
|
|||||||
@@ -104,5 +104,5 @@ public interface IStudyCourseService {
|
|||||||
|
|
||||||
List<CourseStudyItem> findByCourseAndUsers(String courseId,List<String> aids) throws Exception;
|
List<CourseStudyItem> findByCourseAndUsers(String courseId,List<String> aids) throws Exception;
|
||||||
|
|
||||||
List<String> getCourseId(String userId);
|
List<StudyCourse> getCourseId(String userId);
|
||||||
}
|
}
|
||||||
@@ -708,8 +708,9 @@ public class StudyCourseServiceImpl implements IStudyCourseService{
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<String> getCourseId(String userId) {
|
public List<StudyCourse> getCourseId(String userId) {
|
||||||
return studyCourseDao.findList(FieldFilters.eq("aid", userId)).stream().map(StudyCourse::getCourseId).collect(Collectors.toList());
|
return studyCourseDao.findList(FieldFilters.eq("aid", userId));
|
||||||
|
// return studyCourseDao.findList(FieldFilters.eq("aid", userId)).stream().map(StudyCourse::getCourseId).collect(Collectors.toList());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
Reference in New Issue
Block a user