|
@@ -46,13 +46,24 @@ public class ExamApi {
|
|
|
|
|
|
@ApiOperation(value="查询所有考试批次",notes = "分页带查询")
|
|
|
@GetMapping("/exam/all/{curPage}/{pageSize}")
|
|
|
- public ResponseEntity getAllExam(@ModelAttribute Exam examCriteria, @PathVariable Integer curPage,@PathVariable Integer pageSize){
|
|
|
+ public ResponseEntity getAllExam(HttpServletRequest request,
|
|
|
+ @ModelAttribute Exam examCriteria,
|
|
|
+ @PathVariable Integer curPage,
|
|
|
+ @PathVariable Integer pageSize){
|
|
|
+ AccessUser accessUser = (AccessUser) request.getAttribute("accessUser");
|
|
|
+ if(accessUser != null){
|
|
|
+ examCriteria.setOrgId(accessUser.getRootOrgId());
|
|
|
+ }
|
|
|
return new ResponseEntity(examService.getAllExam(examCriteria,new PageRequest(curPage,pageSize)), HttpStatus.OK);
|
|
|
}
|
|
|
|
|
|
@ApiOperation(value="查询所有考试批次",notes = "不分页带查询")
|
|
|
@GetMapping("/exam/all")
|
|
|
- public ResponseEntity getAllExam(@ModelAttribute Exam examCriteria){
|
|
|
+ public ResponseEntity getAllExam(HttpServletRequest request,@ModelAttribute Exam examCriteria){
|
|
|
+ AccessUser accessUser = (AccessUser) request.getAttribute("accessUser");
|
|
|
+ if(accessUser != null){
|
|
|
+ examCriteria.setOrgId(accessUser.getRootOrgId());
|
|
|
+ }
|
|
|
return new ResponseEntity(examService.getAllExam(examCriteria), HttpStatus.OK);
|
|
|
}
|
|
|
|