From d457726064e3dc629ec9c660a6a0dedad675a89f Mon Sep 17 00:00:00 2001
From: 86182 <bjy18234674226@163.com>
Date: Tue, 1 Nov 2022 18:37:17 +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   | 38 +++++++++++--------
 1 file changed, 22 insertions(+), 16 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 d9c67b04..80449c39 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
@@ -136,25 +136,31 @@ 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++;
+		int i=0;
+		if(!courses.isEmpty()){
+			for (Course c:courses) {
+				coursePageList.getList().set(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));
+
+		for (Course c:coursePageList.getList()) {
+			coursePageList.getList().set(i,c);
 		}
 
+
+//		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()){
@@ -168,12 +174,12 @@ public class PortalIndexApi extends ApiBaseController{
 		List<String> ids=new ArrayList<String>();
 
 
-		for(Course c :list.getList()) {
+		for(Course c :coursePageList.getList()) {
 			ids.add(c.getId());
 		}
 		List<CourseTeacher> teachers = courseService.findTeachersByCourseIds(ids);
 		//注意对于多个教师的情况，这里只是设置第一个教师
-		for(Course c :list.getList()) {
+		for(Course c :coursePageList.getList()) {
 			for(CourseTeacher ct : teachers) {
 				if(ct.getCourseId().equals(c.getId())) {
 					c.setSysCreateAid(ct.getTeacherId());