From 309a91cbf61884c5e619a68df818c334d27a5c32 Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期一, 03 六月 2024 09:30:17 +0800
Subject: [PATCH] fix：用户角色查询条件
---
src/main/java/com/mindskip/xzs/controller/admin/QuestionController.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/mindskip/xzs/controller/admin/QuestionController.java b/src/main/java/com/mindskip/xzs/controller/admin/QuestionController.java
index 1dbbad1..faa4c6c 100644
--- a/src/main/java/com/mindskip/xzs/controller/admin/QuestionController.java
+++ b/src/main/java/com/mindskip/xzs/controller/admin/QuestionController.java
@@ -187,7 +187,7 @@
data.add(questionImportVO3);
// 鏌ュ嚭鎵�鏈夌殑璇剧洰锛坋xcel涓嬫媺鏁版嵁锛�
- List<Subject> subjects = subjectMapper.allSubject();
+ List<Subject> subjects = subjectMapper.allSubject(new ArrayList<>(), Boolean.TRUE);
List<String> subjectNameList = subjects.stream().map(Subject::getName).collect(Collectors.toList());
EasyExcel.write(response.getOutputStream(), QuestionImportVO.class)
@@ -248,7 +248,7 @@
response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");
// 鏌ュ嚭鎵�鏈夌殑璇剧洰锛坋xcel涓嬫媺鏁版嵁锛�
- List<Subject> subjects = subjectMapper.allSubject();
+ List<Subject> subjects = subjectMapper.allSubject(new ArrayList<>(), Boolean.TRUE);
List<String> subjectNameList = subjects.stream().map(Subject::getName).collect(Collectors.toList());
EasyExcel.write(response.getOutputStream(), QuestionImportVO.class)
.sheet("棰樼洰瀵煎嚭鏁版嵁")
@@ -341,7 +341,7 @@
// 鏌ュ嚭鎵�鏈夌殑璇剧洰
- List<Subject> subjects = subjectMapper.allSubject();
+ List<Subject> subjects = subjectMapper.allSubject(new ArrayList<>(), Boolean.TRUE);
List<String> subjectNames = Arrays.asList(excelQuestion.getSubjectName().split(SPLIT));
List<Subject> targetSubject = subjects.stream()
.filter(subject -> subjectNames.contains(subject.getName()))
--
Gitblit v1.8.0