From 0c5b8c3a74eff559f8559bc8c0a98c73837aaea2 Mon Sep 17 00:00:00 2001
From: 670788339 <670788339@qq.com>
Date: Tue, 28 May 2024 09:49:48 +0800
Subject: [PATCH] =?UTF-8?q?680=E5=9C=A8=E7=BA=BF=E8=AF=BE=E6=9C=AA?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E5=8F=8A=E6=A0=BC=E7=BA=BF=E6=97=B6=E8=80=83?=
 =?UTF-8?q?=E8=AF=95=E6=97=A0=E6=B3=95=E6=8F=90=E4=BA=A4=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../school/study/service/impl/StudyExamServiceImpl.java    | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyExamServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyExamServiceImpl.java
index 688f565e..67a076d1 100644
--- a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyExamServiceImpl.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyExamServiceImpl.java
@@ -67,7 +67,12 @@ public class StudyExamServiceImpl implements IStudyExamService{
 
 		//用于计算考试成绩
 		CourseExam cexam=cexamDao.get(exam.getTestId());
-		int prog=exam.getScore().intValue()>=exam.getPassLine()?100:exam.getScore().intValue();
+		Integer passLine = 0;
+		if( exam.getPassLine() !=null){
+			passLine = exam.getPassLine();
+		}
+
+		int prog=exam.getScore().intValue()>= passLine?100:exam.getScore().intValue();
 		//完成处理，判断是否已存在
 		Object obj=scItemDao.findField("id", FieldFilters.eq("studyId", exam.getStudyId()), FieldFilters.eq("contentId", exam.getContentId()));
 		int status=exam.getScore()>=exam.getPassLine()?StudyCourseItem.STATUS_FINISH:StudyCourseItem.STATUS_STUDYING;