优化查询

exam-work-api/src/main/java/cn/com/qmth/examcloud/service/examwork/service/ExamStudentService.java

@@ -311,6 +311,9 @@ public class ExamStudentService {
 		Specification<ExamStudent> specification = (root, query, cb) -> {
 		    List<Predicate> predicates = new ArrayList<>();
 //			predicates.add(cb.equal(root.get("exam").get("enable"),true));
+			if(!StringUtils.isEmpty(examCriteria.getStudentId())){
+				predicates.add(cb.equal(root.get("studentId"),examCriteria.getStudentId()));
+			}
 		    if(!StringUtils.isEmpty(examCriteria.getRootOrgId())){
 		    	predicates.add(cb.equal(root.get("rootOrgId"),examCriteria.getRootOrgId()));
 		    }
@@ -341,9 +344,7 @@ public class ExamStudentService {
 		    if(!StringUtils.isEmpty(examCriteria.getFinished())){
 		    	predicates.add(cb.equal(root.get("finished"),examCriteria.getFinished()));
 		    }
-		    if(!StringUtils.isEmpty(examCriteria.getStudentId())){
-		    	predicates.add(cb.equal(root.get("studentId"),examCriteria.getStudentId()));
-		    }
+
 			if(!StringUtils.isEmpty(examCriteria.getExamSite())){
 				predicates.add(cb.like(root.get("examSite"),"%"+examCriteria.getExamSite()+"%"));
 			}