From 6d794867f4255811ad990224b7ca25f6efcf77a0 Mon Sep 17 00:00:00 2001 From: huliguo <2023611923@qq.com> Date: 星期五, 11 七月 2025 12:26:58 +0800 Subject: [PATCH] 新增 --- src/main/java/com/linghu/controller/KeywordController.java | 25 +++++++++++++++++++++---- 1 files changed, 21 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/linghu/controller/KeywordController.java b/src/main/java/com/linghu/controller/KeywordController.java index 58358e0..cee397f 100644 --- a/src/main/java/com/linghu/controller/KeywordController.java +++ b/src/main/java/com/linghu/controller/KeywordController.java @@ -51,6 +51,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.stream.Collectors; @RestController @@ -154,12 +155,20 @@ if (isNow == 0) { List<PlatformProportionVO> result = keywordMapper.getResultByTypeId(keywordId, questionId, keyword.getNum() , typeId); + // 检查列表是否为空或只包含null元素 + boolean isValid = result != null && result.stream() + .anyMatch(Objects::nonNull); - return ResponseResult.success(result); + return isValid ? ResponseResult.success(result) + : ResponseResult.success(new ArrayList<>()); }else { List<PlatformProportionVO> result = keywordMapper.getResultByTypeId(keywordId, questionId, 1, typeId); + boolean isValid = result != null && result.stream() + .anyMatch(Objects::nonNull); - return ResponseResult.success(result); + return isValid ? ResponseResult.success(result) + : ResponseResult.success(new ArrayList<>()); + } } @@ -209,11 +218,19 @@ if (isNow == 0) { List<ResultListVO> result = keywordMapper.getResultByPlatformId(keywordId, questionId, keyword.getNum(), platformId); - return ResponseResult.success(result); + boolean isValid = result != null && result.stream() + .anyMatch(Objects::nonNull); + + return isValid ? ResponseResult.success(result) + : ResponseResult.success(new ArrayList<>()); } else { List<ResultListVO> result = keywordMapper.getResultByPlatformId(keywordId, questionId, 1, platformId); - return ResponseResult.success(result); + boolean isValid = result != null && result.stream() + .anyMatch(Objects::nonNull); + + return isValid ? ResponseResult.success(result) + : ResponseResult.success(new ArrayList<>()); } } -- Gitblit v1.7.1