bug修改

无关风月

3 天以前 5de4a49148636dce6568d37e4c62039934b0a188

 ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java

@@ -184,9 +184,9 @@

    @PostMapping("/subjectList")
//    @ApiOperation(value = "配置学习类型选择题目", tags = {"题目管理"})
    public R<PageInfo<TSubject>> subjectList(@RequestBody ChoiceSubject query) {
        PageInfo<TSubject> res = new PageInfo<>(query.getPageNumber(), query.getPageSize());
        QueryWrapper<TSubject> wrapper = new QueryWrapper<>();
    public R<IPage<TSubject>> subjectList(@RequestBody ChoiceSubject query) {
        // 创建分页对象，传入当前页和每页显示条数
        IPage<TSubject> page = new Page<>(query.getPageNumber(), query.getPageSize());        QueryWrapper<TSubject> wrapper = new QueryWrapper<>();
        if (StringUtils.hasLength(query.getName())) {
            wrapper.like("name", query.getName());
        }
@@ -219,7 +219,9 @@
        }
        List<TCategory> list5 = categoryService.list();
        wrapper.eq("state", 1);
        List<TSubject> list = subjectService.list(wrapper);
        // 执行分页查询
        IPage<TSubject> res = subjectService.page(page, wrapper);
        List<TSubject> list = res.getRecords();

        switch (query.getStudyType()) {
            case 1:
@@ -231,7 +233,6 @@
                    }
                }
                res.setRecords(list);
                res.setTotal(list.size());
                return R.ok(res);
            case 2:
                // 查询出error字段不为空的数据
@@ -250,7 +251,6 @@
                    }
                }
                res.setRecords(tSubjects);
                res.setTotal(tSubjects.size());
                return R.ok(res);
            case 3:
                List<TSubject> list2 = subjectService.list(wrapper);
@@ -263,7 +263,6 @@
                    }
                }
                res.setRecords(list2);
                res.setTotal(list2.size());
                return R.ok(res);
            case 4:
                // 查询出error字段不为空的数据
@@ -281,7 +280,6 @@
                    }
                }
                res.setRecords(tSubjects3);
                res.setTotal(tSubjects3.size());
                return R.ok(res);
            case 5:
                List<TSubject> list4 = subjectService.list(wrapper);
@@ -293,7 +291,6 @@
                    }
                }
                res.setRecords(list4);
                res.setTotal(list4.size());
                return R.ok(res);
        }
        List<TSubject> objects = new ArrayList<>();