Merge branch 'master' of http://git.qmth.com.cn/ExamCloud-3/examcloud-core-examwork.git

examcloud-core-examwork-api-provider/src/main/java/cn/com/qmth/examcloud/core/examwork/api/controller/ExamController.java

@@ -1411,8 +1411,8 @@ public class ExamController extends ControllerSupport {
 	}
 
 	@ApiOperation(value = "查询考试相关的学生设置", notes = "")
-	@GetMapping("getExamStudentSettingsList/{curPage}/{pageSize}")
-	public PageInfo<StudentSpecialSettingsDomain> getExamStudentSettingsList(
+	@GetMapping("getStudentSpecialSettingsList/{curPage}/{pageSize}")
+	public PageInfo<StudentSpecialSettingsDomain> getStudentSpecialSettingsList(
 			@PathVariable Integer curPage, @PathVariable Integer pageSize,
 			@ModelAttribute StudentSpecialSettingsDomain domain) {
 
@@ -1439,8 +1439,7 @@ public class ExamController extends ControllerSupport {
 			}
 
 			if (null != domain.getIdentityNumber()) {
-				predicates.add(cb.equal(root.get("identityNumber"),
-						domain.getIdentityNumber()));
+				predicates.add(cb.equal(root.get("identityNumber"), domain.getIdentityNumber()));
 			} else {
 				predicates.add(cb.isNotNull(root.get("getIdentityNumber")));
 			}