From 2c875554fd972600307a98ed8583f20545a55b99 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 22 五月 2024 10:58:22 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/DolphinEnglish
---
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/impl/TStudyServiceImpl.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/impl/TStudyServiceImpl.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/impl/TStudyServiceImpl.java
index 510ed8e..15966db 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/impl/TStudyServiceImpl.java
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/impl/TStudyServiceImpl.java
@@ -112,8 +112,12 @@
TStudyAnswer data = answerList.get(rand.nextInt(answerList.size()));
// 获取问题题目 和 回答题目
Map<String, Object> result = new HashMap<>(8);
+ List<String> ids = new ArrayList<>();
+ ids.add(String.valueOf(data.getSubject()));
+ ids.add(String.valueOf(data.getAnswerSubject()));
result.put("data", data);
- // todo 有问有答
+ // 有问有答
+ result.put("subject", getSubjects(ids.toArray(ids.toArray(new String[0]))));
return result;
}
--
Gitblit v1.7.1