From 563c0743bb2cbb49271a14c7778bed59a5ca284f Mon Sep 17 00:00:00 2001
From: 86182 <bjy18234674226@163.com>
Date: Tue, 1 Nov 2022 18:54:06 +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   | 44 +++++++++----------
 1 file changed, 21 insertions(+), 23 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 80449c39..ac194256 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
@@ -135,51 +135,49 @@ public class PortalIndexApi extends ApiBaseController{
 		String aid = this.getCurrent().getAccountId();
 		List<Course> courses = courseService.userHobbyList(aid,dto.getOrderField(),dto.getOrderAsc());
 
-		//计算下标,
+		PageList<Course> pageList = new PageList<>();
+		pageList.setList(new ArrayList<>(6));
+
 		int i=0;
 		if(!courses.isEmpty()){
 			for (Course c:courses) {
-				coursePageList.getList().set(i,c);
+				pageList.getList().add(i,c);
 				i++;
 //				coursePageList.getList().remove(coursePageList.getList().size()-i);
 			}
 		}
 
+		//去重并添加
 		for (Course c:coursePageList.getList()) {
-			coursePageList.getList().set(i,c);
+			for (Course c1:courses) {
+				if(!c.getId().equals(c1.getId())){
+					pageList.getList().add(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()){
-//			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 :pageList.getList()) {
 			ids.add(c.getId());
 		}
 		List<CourseTeacher> teachers = courseService.findTeachersByCourseIds(ids);
 		//注意对于多个教师的情况，这里只是设置第一个教师
-		for(Course c :coursePageList.getList()) {
+		for(Course c :pageList.getList()) {
 			for(CourseTeacher ct : teachers) {
 				if(ct.getCourseId().equals(c.getId())) {
 					c.setSysCreateAid(ct.getTeacherId());
@@ -188,7 +186,7 @@ public class PortalIndexApi extends ApiBaseController{
 			}
 		}
 
-		return success(coursePageList);
+		return success(pageList);
 
 
 	}