From 30aab6eab4135038dd0d97bdc4bd5493bede3b3f Mon Sep 17 00:00:00 2001
From: zhaolongfei <2651195677@qq.com>
Date: Thu, 15 Aug 2024 19:03:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86study=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=EF=BC=8Cstudyitemid=E8=BF=94=E5=9B=9E=E5=80=BC=E4=B8=BA?=
 =?UTF-8?q?=E7=A9=BA=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../school/study/service/impl/StudyServiceImpl.java   | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 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 0320f6bd..2a310cb6 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
@@ -98,8 +98,15 @@ public class StudyServiceImpl implements IStudyService{
 		//sci.setProgress(100);//直接设置为学习完成
 		sci.setLastTime(ldt);
 		scItemDao.saveOrUpdate(sci);
-		
-		dto.setStudyItemId(sci.getId());
+		StudyCourseItem sci2 = scItemDao.findOne(FieldFilters
+				.eq("studyId", dto.getStudyId()),FieldFilters
+				.eq("contentId", dto.getContentId()),FieldFilters
+				.eq("aid", dto.getAid()));
+		if (sci2!=null){
+			dto.setStudyItemId(sci2.getId());
+		}else {
+			throw new IllegalArgumentException("StudyItemId不能为空");
+		}
 		//检查是否全部学习完成
 		scDao.finishCheck(dto.getStudyId(),dto.getCourseId(),dto.getContentTotal(),token);