diff --git a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/dataset/DatasetQuestionServiceImpl.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/dataset/DatasetQuestionServiceImpl.java
index 7c2f954c1..a57e0dc38 100644
--- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/dataset/DatasetQuestionServiceImpl.java
+++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/dataset/DatasetQuestionServiceImpl.java
@@ -85,11 +85,23 @@ public class DatasetQuestionServiceImpl implements DatasetQuestionService {
         PageResult<DatasetQuestionDO> datasetQuestionDOPageResult = datasetQuestionMapper.selectPage(pageReqVO);
         PageResult<DatasetQuestionRespVO> result = BeanUtils.toBean(datasetQuestionDOPageResult, DatasetQuestionRespVO.class);
         if (CollectionUtils.isNotEmpty(result.getList())) {
-            result.getList().forEach(item -> {
-                List<DatasetAnswerDO> datasetAnswerDOS = datasetAnswerMapper.selectList(new LambdaQueryWrapper<>(DatasetAnswerDO.class)
-                        .eq(DatasetAnswerDO::getQuestionId, item.getId()));
-                item.setDatasetAnswerRespVO(BeanUtils.toBean(datasetAnswerDOS, DatasetAnswerRespVO.class));
-
+//            result.getList().forEach(item -> {
+//                List<DatasetAnswerDO> datasetAnswerDOS = datasetAnswerMapper.selectList(new LambdaQueryWrapper<>(DatasetAnswerDO.class)
+//                        .eq(DatasetAnswerDO::getQuestionId, item.getId()));
+//                item.setDatasetAnswerRespVO(BeanUtils.toBean(datasetAnswerDOS, DatasetAnswerRespVO.class));
+//
+//            });
+            // 优化代码
+            List<DatasetQuestionRespVO> list = result.getList();
+            // 获取答案
+            Set<Long> collect = list.stream().map(DatasetQuestionRespVO::getId).collect(Collectors.toSet());
+            LambdaQueryWrapper<DatasetAnswerDO> wrapper = new LambdaQueryWrapper<DatasetAnswerDO>()
+                    .in(DatasetAnswerDO::getQuestionId, collect);
+            List<DatasetAnswerDO> datasetAnswerDOS = datasetAnswerMapper.selectList(wrapper);
+            List<DatasetAnswerRespVO> respVOS = BeanUtils.toBean(datasetAnswerDOS, DatasetAnswerRespVO.class);
+            Map<Long, List<DatasetAnswerRespVO>> collect1 = respVOS.stream().collect(Collectors.groupingBy(DatasetAnswerRespVO::getQuestionId));
+            list.forEach(item -> {
+                item.setDatasetAnswerRespVO(collect1.get(item.getId()));
             });
         }
         return result;