From a8d571b2c1b4881bff496f14e9d07ad1dc556f90 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期五, 05 九月 2025 11:12:01 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/DolphinEnglish
---
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TSubjectController.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TSubjectController.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TSubjectController.java
index 73f7083..cb59e36 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TSubjectController.java
+++ b/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)
@@ -70,20 +71,22 @@
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()) {
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());
--
Gitblit v1.7.1