|
@@ -274,8 +274,9 @@ public class PaperController extends ControllerSupport {
|
|
|
@ApiOperation(value = "查询所有导入试卷(not in paperIds)", notes = "查询所有导入试卷(not in paperIds)")
|
|
|
@GetMapping(value = "/genPaper/huoge/{curPage}/{pageSize}")
|
|
|
public ResponseEntity<Object> getGenPapersNotInIds(@ModelAttribute PaperSearchInfo paperSearchInfo,
|
|
|
- @RequestParam String ids, @PathVariable int curPage,
|
|
|
- @PathVariable int pageSize) {
|
|
|
+ @RequestParam(required = false) String ids,
|
|
|
+ @PathVariable int curPage,
|
|
|
+ @PathVariable int pageSize) {
|
|
|
User user = getAccessUser();
|
|
|
UserDataRule ud = getUserDataRule(DataRuleType.COURSE);
|
|
|
paperSearchInfo.setOrgId(user.getRootOrgId().toString());
|
|
@@ -624,8 +625,10 @@ public class PaperController extends ControllerSupport {
|
|
|
@ResponseBody
|
|
|
@ApiOperation(value = "查询所有导入试卷(not in paperIds)", notes = "查询所有导入试卷(not in paperIds)")
|
|
|
@GetMapping(value = "/importPaper/huoge/{curPage}/{pageSize}")
|
|
|
- public ResponseEntity<Object> getImportPapersNotInIds(@ModelAttribute PaperSearchInfo paperSearchInfo, @RequestParam String ids, @PathVariable int curPage,
|
|
|
- @PathVariable int pageSize) {
|
|
|
+ public ResponseEntity<Object> getImportPapersNotInIds(@ModelAttribute PaperSearchInfo paperSearchInfo,
|
|
|
+ @RequestParam(required = false) String ids,
|
|
|
+ @PathVariable int curPage,
|
|
|
+ @PathVariable int pageSize) {
|
|
|
User user = getAccessUser();
|
|
|
UserDataRule ud = getUserDataRule(DataRuleType.COURSE);
|
|
|
paperSearchInfo.setOrgId(user.getRootOrgId().toString());
|