From d95fe2f1ffa6b6bd07410abd2108bd2ed8f141c3 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期三, 16 七月 2025 19:56:31 +0800
Subject: [PATCH] bug修改
---
src/main/java/com/linghu/controller/TypeController.java | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/linghu/controller/TypeController.java b/src/main/java/com/linghu/controller/TypeController.java
index fe65ac2..434c470 100644
--- a/src/main/java/com/linghu/controller/TypeController.java
+++ b/src/main/java/com/linghu/controller/TypeController.java
@@ -112,16 +112,19 @@
@RequestParam(required = false) Integer pageSize,
@RequestParam(required = false) Integer keywordId,
@RequestParam(required = false) Integer questionId,
- @RequestParam Integer isNow
+ @RequestParam(required = false) Integer isNow
) {
List<Integer> typeIds=new ArrayList<>();
+ Keyword keyword=new Keyword();
//先查找当前关键词下，所有的回答 的 所有的平台名称
- Keyword keyword = keywordMapper.selectById(keywordId);
- if (isNow==0){
- typeIds= keywordMapper.getTypeIds(keywordId,questionId,0);
- }else {
- typeIds= keywordMapper.getTypeIds(keywordId,questionId,keyword.getNum());
+ if (keywordId != null) {
+ keyword = keywordMapper.selectById(keywordId);
}
+
+
+ typeIds= keywordMapper.getTypeIds(keywordId,questionId,isNow,keyword);
+
+
/* if (keywordId != null && questionId == null) {
@@ -144,7 +147,14 @@
if (!typeIds.isEmpty()) {
queryWrapper.in(Type::getType_id, typeIds);
}else {
- return ResponseResult.success(new ArrayList<>());
+ if (page != null && pageSize != null) {
+ Page<Type> pageInfo = new Page<>(page, pageSize);
+ Page<Type> result = typeService.page(pageInfo, queryWrapper);
+ return ResponseResult.success(result.getRecords());
+ }else {
+ return ResponseResult.success(new ArrayList<>());
+ }
+
}
if (page != null && pageSize != null) {
--
Gitblit v1.7.1