From 011d61f932a8d9be9f4179f1a06de0a1f6586ff9 Mon Sep 17 00:00:00 2001
From: 670788339 <670788339@qq.com>
Date: Tue, 28 May 2024 19:59:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../school/study/service/impl/StudyExamServiceImpl.java   | 8 +++++++-
 1 file changed, 7 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..bd087326 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,13 @@ 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();
+//		int prog=exam.getScore().intValue()>=exam.getPassLine()?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;