From a3e42a2e26dc8de47548255e01e61f00812ea9b2 Mon Sep 17 00:00:00 2001
From: 86182 <bjy18234674226@163.com>
Date: Tue, 1 Nov 2022 18:26:35 +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   | 35 ++++++++++++++-----
 1 file changed, 26 insertions(+), 9 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 a0d05434..887a89f2 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
@@ -2,6 +2,7 @@ package com.xboe.school.api;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import javax.annotation.Resource;
 
@@ -135,28 +136,44 @@ public class PortalIndexApi extends ApiBaseController{
 		List<Course> courses = courseService.userHobbyList(aid,dto.getOrderField(),dto.getOrderAsc());
 
 		//计算下标,
-		int i=0;
-		if(!courses.isEmpty()){
-			for (Course c:courses) {
-				coursePageList.getList().add(i,c);
-				i++;
-				coursePageList.getList().remove(coursePageList.getList().size()-i);
+//		int i=0;
+//		if(!courses.isEmpty()){
+//			for (Course c:courses) {
+//				coursePageList.getList().add(i,c);
+//				i++;
+//				coursePageList.getList().remove(coursePageList.getList().size()-i);
+//			}
+//		}
+		PageList<Course> list = new PageList<>();
+		list.setList(new ArrayList<>(6));
+		if(!courses.isEmpty()) {
+			for (Course c:courses){
+				list.getList().add(c);
 			}
 		}
+		for (int i=0;i<coursePageList.getList().size();i++) {
+			list.getList().add(coursePageList.getList().get(i));
+		}
 
-
+		//如果有重复
+		List<Course> collect = list.getList().stream().distinct().collect(Collectors.toList());
+		if(collect.size()<list.getList().size()){
+			for (int i=0;i<coursePageList.getList().size();i++) {
+				list.getList().add(coursePageList.getList().get(i));
+			}
+		}
 
 
 		//提取教师信息
 		List<String> ids=new ArrayList<String>();
 
 
-		for(Course c :coursePageList.getList()) {
+		for(Course c :list.getList()) {
 			ids.add(c.getId());
 		}
 		List<CourseTeacher> teachers = courseService.findTeachersByCourseIds(ids);
 		//注意对于多个教师的情况，这里只是设置第一个教师
-		for(Course c :coursePageList.getList()) {
+		for(Course c :list.getList()) {
 			for(CourseTeacher ct : teachers) {
 				if(ct.getCourseId().equals(c.getId())) {
 					c.setSysCreateAid(ct.getTeacherId());