diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java b/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java
index 87e5fae0..dcbb169e 100644
--- a/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java
@@ -288,7 +288,7 @@ public class StudyCourseApi extends ApiBaseController{
 							}
 						}
 					}*/
-					item.setLastStudyTime(item.getStudyDuration());
+					item.setLastStudyTime(item.getStudyDuration()==null? item.getLastStudyTime() : item.getStudyDuration());
 					BigDecimal lastStudyTime = new BigDecimal(item.getLastStudyTime());
 					BigDecimal duration = new BigDecimal(content.getDuration());
 					BigDecimal progress = lastStudyTime.divide(duration, 10, RoundingMode.HALF_UP);
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 773fd1d2..a4d50d06 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
@@ -203,6 +203,7 @@ public class StudyServiceImpl implements IStudyService{
 	public List<StudyCourseItem> findByStudyId(String studyId) {
 		List<StudyCourseItem> list = scItemDao.findList(OrderCondition.desc("lastTime"),FieldFilters.eq("studyId", studyId));
 		for (StudyCourseItem item : list){
+			log.info("-- studyIndex -查询上次学习的是什么资源。mysql查询---------------- item = " + item);
 			String redisKey = "studyId:" + studyId + ":courseId:" + item.getCourseId() + ":courseContentId:" + item.getContentId() + ":studyItemId:" + item.getId();
 			log.info("-- studyIndex -查询上次学习的是什么资源。查询用户的学习情况---------------- redisKey = " + redisKey);
 			String redisValue = redisTemplate.opsForValue().get(redisKey);