From 5749ed70ef32a69c69add0f7490adfbebf211f0f Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 26 八月 2025 16:13:40 +0800
Subject: [PATCH] 8.26
---
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TCategoryController.java | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TCategoryController.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TCategoryController.java
index 877750c..8aba542 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TCategoryController.java
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TCategoryController.java
@@ -43,7 +43,8 @@
@ApiOperation(value = "列表查询", tags = {"2.0新增-题目分类管理"})
public R<PageInfo<CategoryVO>> subjectList(@RequestBody CategoryQuery query) {
query.setState(1);
- List<Integer> integers = new ArrayList<>();
+ List<Integer> integers1 = new ArrayList<>();
+ List<Integer> integers2 = new ArrayList<>();
if (StringUtils.hasLength(query.getSecondName())){
List<Integer> collect = categoryService.lambdaQuery()
@@ -51,7 +52,12 @@
.eq(TCategory::getState, query.getState())
.like(TCategory::getName, query.getSecondName())
.list().stream().map(TCategory::getParentId).collect(Collectors.toList());
- integers.addAll(collect);
+ integers2.addAll(collect);
+ if (integers2.isEmpty()){
+ integers2.add(-1);
+ }
+ query.setSecondIds(integers2);
+
}
if (StringUtils.hasLength(query.getFirstName())){
List<Integer> collect = categoryService.lambdaQuery()
@@ -59,14 +65,14 @@
.eq(TCategory::getState, query.getState())
.like(TCategory::getName, query.getFirstName())
.list().stream().map(TCategory::getId).collect(Collectors.toList());
- integers.addAll(collect);
- }
- if (StringUtils.hasLength(query.getSecondName())&&StringUtils.hasLength(query.getFirstName())){
- if (integers.isEmpty()){
- integers.add(-1);
+ integers1.addAll(collect);
+ if (integers1.isEmpty()){
+ integers1.add(-1);
}
+ query.setFirstIds(integers1);
+
}
- query.setFirstIds(integers);
+
PageInfo<CategoryVO> res = new PageInfo<>(query.getPageNumber(), query.getPageSize());
List<CategoryVO> list = categoryService.listAll(query,res);
--
Gitblit v1.7.1