Merge branch 'zcwy0716-llf' into dev0525

This commit is contained in:
nisen
2024-07-23 18:01:36 +08:00

View File

@@ -186,10 +186,12 @@ public class StudyServiceImpl implements IStudyService{
}else if(status==2){
query.addFilter(FieldFilters.eq("status",9));
}else if (status == 1) {
String sql = "select bsc.* from boe_study_course bsc where bsc.course_id = '"+courseId+"' and bsc.id = " +
" (select bsc.id from boe_study_course bsc " +
String sql = "select bsc.id,bsc.course_id,bsc.course_name,bsc.aname from boe_study_course bsc " +
" where bsc.course_id = '"+courseId+"' and bsc.id != (" +
" select bsc.id from boe_study_course bsc " +
" left join boe_study_course_item item on item.course_id = bsc.course_id and item.study_id = bsc.id " +
" where bsc.course_id = '" + courseId + "' and item.content_id = '"+ contentId+"')";
" where bsc.course_id = '" + courseId + "' and item.content_id = '"+ contentId+"'" +
" )";
List<Object[]> list = scDao.sqlFindList(sql);
List<StudyCourseItem> item = new ArrayList<>();
for (Object[] objs : list) {