mirror of
https://codeup.aliyun.com/67762337eccfc218f6110e0e/per-boe/java-servers.git
synced 2025-12-09 19:06:49 +08:00
提交
This commit is contained in:
@@ -327,6 +327,8 @@ public class CourseServiceImpl implements ICourseService {
|
||||
//自动添加过滤已删除
|
||||
filters.add(FieldFilters.eq("deleted",false));
|
||||
filters.add(FieldFilters.eq("enabled",true));
|
||||
//返回的结果
|
||||
|
||||
|
||||
QueryBuilder query=QueryBuilder.from(Course.class).addFilters(filters);
|
||||
|
||||
@@ -353,24 +355,18 @@ public class CourseServiceImpl implements ICourseService {
|
||||
// if(dto.getTopOrder()!=null && dto.getTopOrder()){
|
||||
// query.addOrder(OrderCondition.desc("topTime"));
|
||||
// }
|
||||
|
||||
|
||||
int num=6;
|
||||
List<Course> courses = this.userHobbyList(dto.getAid(), dto.getOrderField(), dto.getOrderAsc());
|
||||
if(courses!=null && courses.isEmpty()){
|
||||
System.out.println(courses.size());
|
||||
query.setPageSize(pageSize);
|
||||
}
|
||||
else{
|
||||
System.out.println(courses.size());
|
||||
query.setPageSize(pageSize-courses.size());
|
||||
if(courses!=null && !courses.isEmpty()){
|
||||
num=6-courses.size();
|
||||
//重复的不包括
|
||||
List<String> courseIds = courses.stream().map(Course::getId).collect(Collectors.toList());
|
||||
query.addFilter(FieldFilters.notIn("id",courseIds));
|
||||
}
|
||||
|
||||
query.setPageSize(num);
|
||||
query.addFields("new Course(id,type,name,coverImg,score,studys,comments,shares,praises,favorites,forUsers,value,summary,publishTime,isTop)");
|
||||
|
||||
List<Course> rs=courseDao.findList(query.builder());
|
||||
System.out.println(rs.size()+"asdasd");
|
||||
courses.addAll(rs);
|
||||
return courses;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user