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 edaf8b91..9b0176c3 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 @@ -148,8 +148,18 @@ public class PortalIndexApi extends ApiBaseController{ // coursePageList.getList().remove(coursePageList.getList().size()-i); } } + if(!courses.isEmpty()){ + for (Course c:courses) { + for (Course c1:pageList.getList()) { + if(c.getId().equals(c1.getId())){ + pageList.getList().remove(c1); + } + } + } + } - //去重并添加 + + //并添加 for (Course c:coursePageList.getList()) { if(pageList.getList().size()<6){ @@ -160,15 +170,7 @@ public class PortalIndexApi extends ApiBaseController{ } } - //计算下标, - - - - - - - - + //去重,