海豚英语
parent: 2d113b48 | 补丁 | 提交 | ignore whitespace
liujie
5 天以前 a8d571b2c1b4881bff496f14e9d07ad1dc556f90 
Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/DolphinEnglish
1个文件已修改
2 ■■■■■ 已修改文件
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TSubjectController.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TSubjectController.java


@@ -71,7 +71,7 @@


            List<Integer> collect2 = categoryService.lambdaQuery().eq(TCategory::getState, 1)


                    .eq(TCategory::getType, 2)


                    .like(TCategory::getName, query.getCategoryName()).list()


                    .stream().map(TCategory::getId).collect(Collectors.toList());


                    .stream().map(TCategory::getParentId).collect(Collectors.toList());


            collect.addAll(collect2);


            if (collect2.isEmpty()) {


                if (collect.isEmpty()) {