From 9aaab480bf698d5be5450a6c8e591191e8302c40 Mon Sep 17 00:00:00 2001
From: zhaolongfei <2651195677@qq.com>
Date: Tue, 23 Jul 2024 15:05:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E7=AE=A1=E7=90=86=E8=B5=84?=
 =?UTF-8?q?=E6=BA=90=E5=AE=8C=E6=88=90=E6=83=85=E5=86=B5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../school/study/service/impl/StudyServiceImpl.java  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyServiceImpl.java
index db69965e..1564104e 100644
--- a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyServiceImpl.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyServiceImpl.java
@@ -186,22 +186,22 @@ public class StudyServiceImpl implements IStudyService{
 			}else if(status==2){
 				query.addFilter(FieldFilters.eq("status",9));
 			}else if (status == 1) {
-				String sql = "select id,course_id,course_name,aname from boe_study_course where course_id = '"+courseId+"'";
+				String sql = "select id, course_id, course_name, aname from boe_study_course where course_id = '" + courseId + "'";
 				List<Object[]> list = scDao.sqlFindList(sql);
 				query.addFilter(FieldFilters.ne("status", 2));
 				query.addFilter(FieldFilters.ne("status", 9));
-				List<StudyCourseItem> item = new ArrayList<>(list.size());
+
+				List<StudyCourseItem> item = new ArrayList<>();
 				for (Object[] objs : list) {
-					List<StudyCourseItem> itemList = scDao.findList(query.builder());
-					if (itemList.isEmpty()){
+					query.addFilter(FieldFilters.eq("course_id", objs[1])); // 添加一个额外的过滤条件来匹配 course_id
+					List<StudyCourseItem> itemList = scItemDao.findList(query.builder()); // 执行查询
+					if (itemList.isEmpty()) {
 						StudyCourseItem sc = new StudyCourseItem();
 						sc.setProgress(0);
 						sc.setStatus(1);
 						sc.setAname(objs[3].toString());
 						item.add(sc);
 					}
-					PageList<StudyCourseItem> pageList = new PageList<>(item);
-					return pageList;
 				}
 				PageList<StudyCourseItem> pageList = new PageList<>(item);
 				return pageList;