Merge remote-tracking branch 'origin/master'

guyue

1 天以前 b7ff8446a58d59e7df8a588104c231c7af7d8573

 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<>());
        }

    }