diff --git a/enlish-service/src/main/java/com/yinlihupo/enlish/service/service/student/StudentServiceImpl.java b/enlish-service/src/main/java/com/yinlihupo/enlish/service/service/student/StudentServiceImpl.java index 823beb0..7db5f4b 100644 --- a/enlish-service/src/main/java/com/yinlihupo/enlish/service/service/student/StudentServiceImpl.java +++ b/enlish-service/src/main/java/com/yinlihupo/enlish/service/service/student/StudentServiceImpl.java @@ -120,7 +120,10 @@ public class StudentServiceImpl implements StudentService { List wordIds = new java.util.ArrayList<>(examWordsJudgeResultDOS.stream().map(ExamWordsJudgeResultDO::getCorrectWordIds).flatMap(List::stream).toList()); wordIds.addAll(examWordsJudgeResultDOS.stream().map(ExamWordsJudgeResultDO::getWrongWordIds).flatMap(List::stream).toList()); - List vocabularyBankDOS = vocabularyBankMapper.selectVocabularyBankDOListByIds(wordIds); + List vocabularyBankDOS = new ArrayList<>(); + if (!wordIds.isEmpty()) { + vocabularyBankDOS = vocabularyBankMapper.selectVocabularyBankDOListByIds(wordIds); + } Map id2Word = vocabularyBankDOS.stream().collect(Collectors.toMap(VocabularyBankDO::getId, vocabularyBankDO -> vocabularyBankDO)); List examWordsJudgeResultDetails = new ArrayList<>(); diff --git a/enlish-vue/index.html b/enlish-vue/index.html index adc0d2c..b66d5e7 100644 --- a/enlish-vue/index.html +++ b/enlish-vue/index.html @@ -3,7 +3,7 @@ - + enlish-vue diff --git a/enlish-vue/src/App.vue b/enlish-vue/src/App.vue index aa7d155..ead2f70 100644 --- a/enlish-vue/src/App.vue +++ b/enlish-vue/src/App.vue @@ -3,12 +3,17 @@ + diff --git a/enlish-vue/src/layouts/components/AddGradeDialog.vue b/enlish-vue/src/layouts/components/AddGradeDialog.vue index 3123abb..20c3077 100644 --- a/enlish-vue/src/layouts/components/AddGradeDialog.vue +++ b/enlish-vue/src/layouts/components/AddGradeDialog.vue @@ -1,19 +1,19 @@ - + diff --git a/enlish-vue/src/layouts/components/AddStudentDialog.vue b/enlish-vue/src/layouts/components/AddStudentDialog.vue index 5751a6c..17b96b7 100644 --- a/enlish-vue/src/layouts/components/AddStudentDialog.vue +++ b/enlish-vue/src/layouts/components/AddStudentDialog.vue @@ -1,17 +1,17 @@ - + diff --git a/enlish-vue/src/layouts/components/ExamWordsDetailCard.vue b/enlish-vue/src/layouts/components/ExamWordsDetailCard.vue index e90a81b..88f46c8 100644 --- a/enlish-vue/src/layouts/components/ExamWordsDetailCard.vue +++ b/enlish-vue/src/layouts/components/ExamWordsDetailCard.vue @@ -1,5 +1,5 @@ - + diff --git a/enlish-vue/src/layouts/components/Header.vue b/enlish-vue/src/layouts/components/Header.vue index 8493d4c..a2beb05 100644 --- a/enlish-vue/src/layouts/components/Header.vue +++ b/enlish-vue/src/layouts/components/Header.vue @@ -37,7 +37,7 @@ - - diff --git a/enlish-vue/src/pages/class.vue b/enlish-vue/src/pages/class.vue index 945d045..d2db23a 100644 --- a/enlish-vue/src/pages/class.vue +++ b/enlish-vue/src/pages/class.vue @@ -6,7 +6,7 @@ - + @@ -15,17 +15,28 @@
班级列表
- - - + +
+
+
{{ row.title }}
+
年级：{{ row.gradeName }}
+
+ 选择 + 删除 +
+
+
- - - - - - -