From 9db2cb7ac57c8e10b47dcfab4af0055845920797 Mon Sep 17 00:00:00 2001 From: 86182 Date: Wed, 26 Oct 2022 17:06:04 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/course/service/ICourseService.java | 2 +- .../course/service/impl/CourseServiceImpl.java | 15 ++++++++++++++- .../java/com/xboe/school/api/PortalIndexApi.java | 2 +- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/course/service/ICourseService.java b/servers/boe-server-all/src/main/java/com/xboe/module/course/service/ICourseService.java index 1f285238..6ddf3b53 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/course/service/ICourseService.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/service/ICourseService.java @@ -296,7 +296,7 @@ public interface ICourseService { /** * 查询出三条关联兴趣爱好的数据 * */ - List userHobbyList(String aid); + List userHobbyList(String aid,String orderField,Boolean orderAsc); } 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 23343e1c..c3612257 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 @@ -958,7 +958,7 @@ public class CourseServiceImpl implements ICourseService { } @Override - public List userHobbyList(String aid) { + public List userHobbyList(String aid,String orderField,Boolean orderAsc) { List courses = new ArrayList<>(); if(StringUtil.isNotBlank(aid)){ String sql="select ref_id from boe_user_hobby where aid='"+aid+"'"; @@ -977,6 +977,19 @@ public class CourseServiceImpl implements ICourseService { iFieldFilters.add(FieldFilters.in("sysType2",strings)); iFieldFilters.add(FieldFilters.in("sysType3",strings)); builder.addFilter(FieldFilters.or(iFieldFilters)); + OrderCondition oc=null; + if(StringUtils.isNotBlank(orderField)) { + if(orderAsc==null || orderAsc) { + oc=OrderCondition.asc(orderField); + }else { + oc=OrderCondition.desc(orderField); + } + }else { + //oc=OrderCondition.desc("id"); + //默认按发布时间排序 + oc=OrderCondition.desc("publishTime"); + } + builder.addOrder(oc); courses=courseDao.findList(builder.builder()); } return courses; diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/api/PortalIndexApi.java b/servers/boe-server-all/src/main/java/com/xboe/school/api/PortalIndexApi.java index 907d32a3..3602a931 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/school/api/PortalIndexApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/school/api/PortalIndexApi.java @@ -132,7 +132,7 @@ public class PortalIndexApi extends ApiBaseController{ PageList coursePageList = courseService.findSimplePage(pager.getPageIndex(), pager.getPageSize(),dto); String aid = this.getCurrent().getAccountId(); - List courses = courseService.userHobbyList(aid); + List courses = courseService.userHobbyList(aid,dto.getOrderField(),dto.getOrderAsc()); //计算下标, int i=0;