From 2e0ab4a5f88bd3f947efd4f34db7f0981ab47351 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期五, 05 九月 2025 11:28:15 +0800
Subject: [PATCH] 修改查询
---
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TSubjectController.java | 39 ++++++++++++++++++++++-----------------
1 files changed, 22 insertions(+), 17 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 bc489fc..5c3653a 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,27 +61,32 @@
public R<PageInfo<SubjectVO>> subjectList(@RequestBody SubjectQuery query) {
PageInfo<SubjectVO> res = new PageInfo<>(query.getPageNumber(), query.getPageSize());
List<Integer> integers = new ArrayList<>();
- if (StringUtils.hasLength(query.getCategoryName())){
- List<Integer> collect = categoryService.lambdaQuery()
- .eq(TCategory::getType, 2)
- .eq(TCategory::getState, 1)
- .like(TCategory::getName, query.getCategoryName())
- .list().stream().map(TCategory::getParentId).collect(Collectors.toList());
- integers.addAll(collect);
- List<Integer> collect2 = categoryService.lambdaQuery()
+ int type=0;
+ if (StringUtils.hasLength(query.getCategoryName())) {
+ // 查询分类id包含的
+ List<Integer> collect = categoryService.lambdaQuery().eq(TCategory::getState, 1)
.eq(TCategory::getType, 1)
- .eq(TCategory::getState, 1)
- .like(TCategory::getName, query.getCategoryName())
- .list().stream().map(TCategory::getId).collect(Collectors.toList());
- integers.addAll(collect2);
- }
- if (StringUtils.hasLength(query.getCategoryName())){
- if (integers.isEmpty()){
- integers.add(-1);
+ .like(TCategory::getName, query.getCategoryName()).list()
+ .stream().map(TCategory::getId).collect(Collectors.toList());// 查询分类id包含的
+ 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());
+ 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