From a6f715179ba7658a9f5ed571912154df4f9ab39b Mon Sep 17 00:00:00 2001
From: 86182 <bjy18234674226@163.com>
Date: Tue, 1 Nov 2022 19:47:12 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E8=AF=BE=E7=A8=8B=E6=8E=92?=
 =?UTF-8?q?=E8=A1=8C=E6=A6=9C=E6=8E=92=E5=BA=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/xboe/school/api/PortalIndexApi.java   | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

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{
 			}
 		}
 		
-		//计算下标,
-		
-		
-
-		
-		
-		
-
-
+		//去重,