修改查询

liujie

5 天以前 2e0ab4a5f88bd3f947efd4f34db7f0981ab47351

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

@@ -61,6 +61,7 @@
    public R<PageInfo<SubjectVO>> subjectList(@RequestBody SubjectQuery query) {
        PageInfo<SubjectVO> res = new PageInfo<>(query.getPageNumber(), query.getPageSize());
        List<Integer> integers = new ArrayList<>();
        int type=0;
        if (StringUtils.hasLength(query.getCategoryName())) {
            // 查询分类id包含的
            List<Integer> collect = categoryService.lambdaQuery().eq(TCategory::getState, 1)
@@ -76,14 +77,16 @@
                if (collect.isEmpty()) {
                    collect.add(-1);
                }
                type=1;
                integers = collect;
            }else{
                type=2;
                integers = collect2;
            }
        }

        query.setIds(integers);
        List<SubjectVO> list =  subjectService.listAll(query);
        List<SubjectVO> list =  subjectService.listAll(query,type);
        for (SubjectVO subjectVO : list) {
            if (subjectVO.getFirstCategory()!=null&&subjectVO.getSecondCategory()!=null){
                TCategory byId1 = categoryService.getById(subjectVO.getFirstCategory());