From c8f632ab7900cd050ad4a2f3b8ae64f0bc2cf99d Mon Sep 17 00:00:00 2001 From: daihh Date: Tue, 1 Nov 2022 21:00:17 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../course/service/impl/CourseServiceImpl.java | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java index f05ab9e8..2b67a90e 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java @@ -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 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 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 rs=courseDao.findList(query.builder()); - System.out.println(rs.size()+"asdasd"); courses.addAll(rs); return courses; }