|
@@ -145,11 +145,21 @@ public class MockApplyController extends BaseController {
|
|
|
@PreAuthorize("@ss.hasPermi('system:apply:list')")
|
|
|
@GetMapping("/listMockLive")
|
|
|
public TableDataInfo<MockMajorSubjectVo> listMockLive(MockApplyQueryBo bo) {
|
|
|
+ Integer pageNum = 0;
|
|
|
+ Integer pageSize = 0;
|
|
|
+ if (Validator.isNotEmpty(bo.getPageNum()) && Validator.isNotEmpty(bo.getPageSize())) {
|
|
|
+ pageNum = bo.getPageNum();
|
|
|
+ pageSize = bo.getPageSize();
|
|
|
+ bo.setPageNum(null);
|
|
|
+ bo.setPageSize(null);
|
|
|
+ }
|
|
|
List<MockMajorSubjectVo> list = iMockApplyService.listMockLive(bo);
|
|
|
+ bo.setPageNum(pageNum);
|
|
|
+ bo.setPageSize(pageSize);
|
|
|
if (Validator.isEmpty(bo.getPageNum()) || Validator.isEmpty(bo.getPageSize())) {
|
|
|
return getDataTable(list);
|
|
|
}
|
|
|
- return getDataTable(getPageInfo(bo.getPageNum(), bo.getPageSize(), list).getList());
|
|
|
+ return getDataTable(getPageInfo(pageNum, pageSize, list).getList());
|
|
|
}
|
|
|
|
|
|
/**
|