From da0dc25eef2708660b83e7669cf477a6ec68ac62 Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期二, 02 七月 2024 17:48:46 +0800
Subject: [PATCH] feat：新增创建试卷部门
---
src/main/java/com/mindskip/xzs/controller/admin/ExamPaperController.java | 4 ++--
1 files changed, 2 insertions(+), 2 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 1986f67..cdff2d2 100644
--- a/src/main/java/com/mindskip/xzs/controller/admin/ExamPaperController.java
+++ b/src/main/java/com/mindskip/xzs/controller/admin/ExamPaperController.java
@@ -20,7 +20,6 @@
import com.mindskip.xzs.viewmodel.admin.exam.ExamPaperPageRequestVM;
import com.mindskip.xzs.viewmodel.admin.exam.ExamResponseVM;
import lombok.SneakyThrows;
-import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -50,7 +49,7 @@
@RequestMapping(value = "/page", method = RequestMethod.POST)
public RestResponse<PageInfo<ExamResponseVM>> pageList(@RequestBody ExamPaperPageRequestVM model) {
- model.setDeptIds(ObjectUtils.isNotEmpty(model.getDeptIds()) ? model.getDeptIds() : getAdminDeptIds());
+// model.setDeptIds(ObjectUtils.isNotEmpty(model.getDeptIds()) ? model.getDeptIds() : getAdminDeptIds());
if (Objects.nonNull(model.getLevel())) {
model.setDeptIds(Collections.singletonList(model.getLevel()));
}
@@ -61,6 +60,7 @@
vm.setCreateTime(DateTimeUtil.dateFormat(e.getCreateTime()));
vm.setSubjectId(examPaperSubjectService.getByExamPaperId(vm.getId())
.stream().map(ExamPaperSubject::getSubjectId).toArray(Integer[]::new));
+ vm.setCreateDepartment(examPaperDepartmentService.selectByUserId(vm.getCreateUser()));
return vm;
});
return RestResponse.ok(page);
--
Gitblit v1.8.0