diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyCourseServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyCourseServiceImpl.java index 11297424..cf1b8e7f 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyCourseServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyCourseServiceImpl.java @@ -392,24 +392,25 @@ public class StudyCourseServiceImpl implements IStudyCourseService{ List clist= studyCourseDao.findListFields(courseHql,studyCourseQuery.getIds()); List slist= studyCourseDao.findListFields(studyHql,studyCourseQuery.getAids(),studyCourseQuery.getIds()); //数据数量一般不会太多,不超过20条,所以直接使用嵌套循环 - for(Object[] cobjs : clist) { + for(Object[] sobjs : slist) { StudyCourse sc=new StudyCourse(); - sc.setCourseId(ConvertUtil.toStr(cobjs[0])); - sc.setCourseImage(ConvertUtil.toStr(cobjs[1])); - sc.setLastScore(ConvertUtil.toFloat(cobjs[2]));//课程分数,使用此值来承载 - for(Object[] sobjs : slist) { - String cid=ConvertUtil.toStr(sobjs[0]); + sc.setCourseId(ConvertUtil.toStr(sobjs[0])); + sc.setAddTime((LocalDateTime)sobjs[1]); + sc.setProgress(ConvertUtil.toFloat(sobjs[2])); + sc.setAid(ConvertUtil.toStr(sobjs[3])); + + for(Object[] cobjs : clist) { + String cid=ConvertUtil.toStr(cobjs[0]); if(cid!=null && cid.equals(sc.getCourseId())) { - sc.setAddTime((LocalDateTime)sobjs[1]); - sc.setProgress(ConvertUtil.toFloat(sobjs[2])); - sc.setAid(ConvertUtil.toStr(sobjs[3])); + sc.setCourseImage(ConvertUtil.toStr(cobjs[1])); + sc.setLastScore(ConvertUtil.toFloat(cobjs[2]));//课程分数,使用此值来承载 + break; } } if(sc.getProgress()==null) { sc.setProgress(0f); } rs.add(sc); - } }catch(Exception e) { log.error("查询错误",e);