hz/java-servers
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/per-boe/java-servers.git synced 2025-12-11 03:46:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

提交

Browse Source
This commit is contained in:
daihh
2022-11-01 21:00:17 +08:00
parent 02ca78c657
commit c8f632ab79
1 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java
View File

@@ -327,6 +327,8 @@ public class CourseServiceImpl implements ICourseService {
//自动添加过滤已删除 //自动添加过滤已删除
filters.add(FieldFilters.eq("deleted",false)); filters.add(FieldFilters.eq("deleted",false));
filters.add(FieldFilters.eq("enabled",true)); filters.add(FieldFilters.eq("enabled",true));
//返回的结果
QueryBuilder query=QueryBuilder.from(Course.class).addFilters(filters); QueryBuilder query=QueryBuilder.from(Course.class).addFilters(filters);
@@ -353,24 +355,18 @@ public class CourseServiceImpl implements ICourseService {
// if(dto.getTopOrder()!=null && dto.getTopOrder()){ // if(dto.getTopOrder()!=null && dto.getTopOrder()){
// query.addOrder(OrderCondition.desc("topTime")); // query.addOrder(OrderCondition.desc("topTime"));
// } // }
int num=6;
List<Course> courses = this.userHobbyList(dto.getAid(), dto.getOrderField(), dto.getOrderAsc()); List<Course> courses = this.userHobbyList(dto.getAid(), dto.getOrderField(), dto.getOrderAsc());
if(courses!=null && courses.isEmpty()){ if(courses!=null && !courses.isEmpty()){
System.out.println(courses.size()); num=6-courses.size();
query.setPageSize(pageSize);
}
else{
System.out.println(courses.size());
query.setPageSize(pageSize-courses.size());
//重复的不包括 //重复的不包括
List<String> courseIds = courses.stream().map(Course::getId).collect(Collectors.toList()); List<String> courseIds = courses.stream().map(Course::getId).collect(Collectors.toList());
query.addFilter(FieldFilters.notIn("id",courseIds)); 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)"); 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()); List<Course> rs=courseDao.findList(query.builder());
System.out.println(rs.size()+"asdasd");
courses.addAll(rs); courses.addAll(rs);
return courses; return courses;
} }