|
@@ -555,6 +555,12 @@ public class ExamCloudServiceProvider extends ControllerSupport implements ExamC
|
|
|
if (StringUtils.isNotEmpty(req.getPaperType())) {
|
|
|
predicates.add(cb.equal(root.get("paperType"), req.getPaperType()));
|
|
|
}
|
|
|
+ if (StringUtils.isNotEmpty(req.getExamSite())) {
|
|
|
+ predicates.add(cb.equal(root.get("examSite"), req.getExamSite()));
|
|
|
+ }
|
|
|
+ if (null != req.getOrgId()) {
|
|
|
+ predicates.add(cb.equal(root.get("orgId"), req.getOrgId()));
|
|
|
+ }
|
|
|
|
|
|
return cb.and(predicates.toArray(new Predicate[predicates.size()]));
|
|
|
};
|