|
@@ -113,8 +113,10 @@ public class StudentController extends ControllerSupport {
|
|
@GetMapping("studentPage/{curPage}/{pageSize}")
|
|
@GetMapping("studentPage/{curPage}/{pageSize}")
|
|
public PageInfo<StudentDomain> getStudentPage(
|
|
public PageInfo<StudentDomain> getStudentPage(
|
|
@PathVariable Integer curPage,
|
|
@PathVariable Integer curPage,
|
|
- @PathVariable Integer pageSize, @RequestParam String name,
|
|
|
|
- @RequestParam String studentCode, @RequestParam String identityNumber,
|
|
|
|
|
|
+ @PathVariable Integer pageSize,
|
|
|
|
+ @RequestParam(required = false) String name,
|
|
|
|
+ @RequestParam(required = false) String studentCode,
|
|
|
|
+ @RequestParam(required = false) String identityNumber,
|
|
@RequestParam(required = false) Long rootOrgId,
|
|
@RequestParam(required = false) Long rootOrgId,
|
|
@RequestParam(required = false) Long orgId,
|
|
@RequestParam(required = false) Long orgId,
|
|
@RequestParam(required = false) BooleanSelect enable,
|
|
@RequestParam(required = false) BooleanSelect enable,
|
|
@@ -282,9 +284,9 @@ public class StudentController extends ControllerSupport {
|
|
@DataRule(type = DataRuleType.ORG)
|
|
@DataRule(type = DataRuleType.ORG)
|
|
@ApiOperation(value = "导出学生", notes = "")
|
|
@ApiOperation(value = "导出学生", notes = "")
|
|
@GetMapping("export")
|
|
@GetMapping("export")
|
|
- public void exportStudents(@RequestParam String name,
|
|
|
|
- @RequestParam String studentCode,
|
|
|
|
- @RequestParam String identityNumber,
|
|
|
|
|
|
+ public void exportStudents(@RequestParam(required = false) String name,
|
|
|
|
+ @RequestParam(required = false) String studentCode,
|
|
|
|
+ @RequestParam(required = false) String identityNumber,
|
|
@RequestParam(required = false) Long rootOrgId,
|
|
@RequestParam(required = false) Long rootOrgId,
|
|
@RequestParam(required = false) Long orgId,
|
|
@RequestParam(required = false) Long orgId,
|
|
@RequestParam(required = false) BooleanSelect hasPhoto) {
|
|
@RequestParam(required = false) BooleanSelect hasPhoto) {
|