|
@@ -435,6 +435,10 @@ public class ExamCloudServiceProvider extends ControllerSupport implements ExamC
|
|
|
|
|
|
predicates.add(cb.greaterThanOrEqualTo(root.get("courseId"), start));
|
|
predicates.add(cb.greaterThanOrEqualTo(root.get("courseId"), start));
|
|
|
|
|
|
|
|
+ if (null != req.getCourseEnable()) {
|
|
|
|
+ predicates.add(cb.equal(root.get("courseEnable"), req.getCourseEnable()));
|
|
|
|
+ }
|
|
|
|
+
|
|
return cb.and(predicates.toArray(new Predicate[predicates.size()]));
|
|
return cb.and(predicates.toArray(new Predicate[predicates.size()]));
|
|
};
|
|
};
|
|
|
|
|
|
@@ -453,6 +457,7 @@ public class ExamCloudServiceProvider extends ControllerSupport implements ExamC
|
|
b.setCourseLevel(e.getCourseLevel());
|
|
b.setCourseLevel(e.getCourseLevel());
|
|
b.setCourseName(e.getCourseName());
|
|
b.setCourseName(e.getCourseName());
|
|
b.setExamId(examId);
|
|
b.setExamId(examId);
|
|
|
|
+ b.setCourseEnable(e.getCourseEnable());
|
|
|
|
|
|
next = e.getCourseId();
|
|
next = e.getCourseId();
|
|
list.add(b);
|
|
list.add(b);
|