Merge branch 'master' of https://git.oschina.net/songyue123456/ExamCloud-service-exam-work.git

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

@@ -269,8 +269,8 @@ public class ExamStudentService {
 		    if(!StringUtils.isEmpty(examCriteria.getOrgId())){
 		    	predicates.add(cb.equal(root.get("orgId"),examCriteria.getOrgId()));
 		    }
-		    if(!StringUtils.isEmpty(examCriteria.getExam())){
-		    	predicates.add(cb.equal(root.get("exam").get("id"),examCriteria.getExam().getId()));
+		    if(!StringUtils.isEmpty(examCriteria.getExamId())){
+		    	predicates.add(cb.equal(root.get("exam").get("id"),examCriteria.getExamId()));
 		    }
 		    if(!StringUtils.isEmpty(examCriteria.getName())){
 		    	predicates.add(cb.like(root.get("name"),"%"+examCriteria.getName()+"%"));

exam-work-domain/src/main/java/cn/com/qmth/examcloud/service/examwork/dto/ExamStudentDTO.java

@@ -11,6 +11,8 @@ public class ExamStudentDTO {
 	private String name;
 
 	private Exam exam;
+
+	private Long examId;
 	/**
 	 * 学校id
 	 */
@@ -254,6 +256,14 @@ public class ExamStudentDTO {
 		this.examSite = examSite;
 	}
 
+	public Long getExamId() {
+		return examId;
+	}
+
+	public void setExamId(Long examId) {
+		this.examId = examId;
+	}
+
 	public ExamStudentDTO() {
 	}
 }