From 6d05f0dc6e96ead24bb7e035e16f18031b1ede78 Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期五, 17 五月 2024 11:35:26 +0800
Subject: [PATCH] feat：看题新增查询条件
---
src/main/java/com/mindskip/xzs/controller/admin/ExamPaperController.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/mindskip/xzs/controller/admin/ExamPaperController.java b/src/main/java/com/mindskip/xzs/controller/admin/ExamPaperController.java
index 9facf4a..892f2e3 100644
--- a/src/main/java/com/mindskip/xzs/controller/admin/ExamPaperController.java
+++ b/src/main/java/com/mindskip/xzs/controller/admin/ExamPaperController.java
@@ -25,7 +25,9 @@
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.util.Arrays;
+import java.util.Collections;
import java.util.List;
+import java.util.Objects;
@RestController("AdminExamPaperController")
@RequestMapping(value = "/api/admin/exam/paper")
@@ -46,6 +48,10 @@
@RequestMapping(value = "/page", method = RequestMethod.POST)
public RestResponse<PageInfo<ExamResponseVM>> pageList(@RequestBody ExamPaperPageRequestVM model) {
+ model.setDeptIds(isDeptAdmin() ? getAdminDeptIds() : null);
+ if (Objects.nonNull(model.getLevel())) {
+ model.setDeptIds(Collections.singletonList(model.getLevel()));
+ }
model.setType("0");
PageInfo<ExamPaper> pageInfo = examPaperService.page(model);
PageInfo<ExamResponseVM> page = PageInfoHelper.copyMap(pageInfo, e -> {
@@ -126,6 +132,7 @@
@RequestMapping(value = "/list", method = RequestMethod.GET)
public RestResponse<List<ExamPaper>> list() {
- return RestResponse.ok(examPaperService.list());
+ List<Integer> deptIds = isDeptAdmin() ? getAdminDeptIds() : null;
+ return RestResponse.ok(examPaperService.list(deptIds));
}
}
--
Gitblit v1.8.0