From f4f84ef25ce94e59dfe57961fcbb3c81f738ebb8 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 17 五月 2024 16:26:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/mindskip/xzs/controller/admin/ExamTemplatesController.java | 19 +++++++++----------
1 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/mindskip/xzs/controller/admin/ExamTemplatesController.java b/src/main/java/com/mindskip/xzs/controller/admin/ExamTemplatesController.java
index 843762e..161d99d 100644
--- a/src/main/java/com/mindskip/xzs/controller/admin/ExamTemplatesController.java
+++ b/src/main/java/com/mindskip/xzs/controller/admin/ExamTemplatesController.java
@@ -3,32 +3,29 @@
import com.github.pagehelper.PageInfo;
import com.mindskip.xzs.base.BaseApiController;
import com.mindskip.xzs.base.RestResponse;
-import com.mindskip.xzs.domain.ExamPaper;
+import com.mindskip.xzs.context.WebContext;
import com.mindskip.xzs.domain.ExamTemplates;
import com.mindskip.xzs.domain.ExamTemplatesSubject;
-import com.mindskip.xzs.domain.User;
import com.mindskip.xzs.domain.vo.ExamTemplatesVO;
+import com.mindskip.xzs.repository.DepartmentMapper;
import com.mindskip.xzs.repository.ExamTemplatesSubjectMapper;
import com.mindskip.xzs.service.ExamTemplatesService;
import com.mindskip.xzs.utility.PageInfoHelper;
import com.mindskip.xzs.viewmodel.admin.exam.ExamPaperEditRequestVM;
-import lombok.extern.slf4j.Slf4j;
+import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
-import java.util.List;
@RestController("AdminExamTemplatesController")
@RequestMapping(value = "/api/admin/exam/templates")
+@RequiredArgsConstructor
public class ExamTemplatesController extends BaseApiController {
private final ExamTemplatesService examTemplatesService;
private final ExamTemplatesSubjectMapper examTemplatesSubjectMapper;
-
- public ExamTemplatesController(ExamTemplatesService examTemplatesService, ExamTemplatesSubjectMapper examTemplatesSubjectMapper) {
- this.examTemplatesService = examTemplatesService;
- this.examTemplatesSubjectMapper = examTemplatesSubjectMapper;
- }
+ private final WebContext webContext;
+ private final DepartmentMapper departmentMapper;
@RequestMapping(value = "/edit", method = RequestMethod.POST)
public RestResponse edit(@RequestBody @Valid ExamPaperEditRequestVM model) {
@@ -38,7 +35,9 @@
@RequestMapping(value = "/list", method = RequestMethod.GET)
public RestResponse<PageInfo<ExamTemplatesVO>> list(ExamTemplatesVO examTemplatesVO) throws Exception {
- PageInfo<ExamTemplates> pageInfo = examTemplatesService.gets(examTemplatesVO);
+ // 濡傛灉鏄儴闂ㄧ鐞嗗憳锛岄渶瑕佸仛鏁版嵁鏉冮檺
+ examTemplatesVO.setDeptId(isDeptAdmin() ? getAdminDeptIds() : null);
+ PageInfo<ExamTemplates> pageInfo = examTemplatesService.getByadmins(examTemplatesVO);
PageInfo<ExamTemplatesVO> info = PageInfoHelper.copyMap(pageInfo, e -> {
ExamTemplatesVO vo = new ExamTemplatesVO();
vo.setName(e.getName());
--
Gitblit v1.8.0