|
@@ -172,12 +172,12 @@ public class UserController extends BaseController {
|
|
|
@GetMapping("/getSchoolList")
|
|
@GetMapping("/getSchoolList")
|
|
|
@Anonymous
|
|
@Anonymous
|
|
|
@ApiOperation("查询学校列表")
|
|
@ApiOperation("查询学校列表")
|
|
|
- public TableDataInfo getSchoolList(@ApiParam("keyword") String keyword)
|
|
|
|
|
|
|
+ public TableDataInfo getSchoolList(@ApiParam("examType") @RequestParam(required = false) String examType, @ApiParam("keyword") @RequestParam(required = false) String keyword)
|
|
|
{
|
|
{
|
|
|
DzSchool dzSchool = new DzSchool();
|
|
DzSchool dzSchool = new DzSchool();
|
|
|
dzSchool.setCampus(false);
|
|
dzSchool.setCampus(false);
|
|
|
dzSchool.setName(keyword);
|
|
dzSchool.setName(keyword);
|
|
|
- dzSchool.setExamTypes(VistorContextHolder.getContext().getExamType().name());
|
|
|
|
|
|
|
+ dzSchool.setExamTypes(StringUtils.isNotBlank(examType) ? examType : VistorContextHolder.getExamType().name());
|
|
|
startPage();
|
|
startPage();
|
|
|
List<DzSchool> list = dzSchoolService.selectDzSchoolList(dzSchool);
|
|
List<DzSchool> list = dzSchoolService.selectDzSchoolList(dzSchool);
|
|
|
return getDataTable(list);
|
|
return getDataTable(list);
|