From ded4f0891dd2a76f36844d7c220155e3cd1e6918 Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期四, 16 五月 2024 17:10:28 +0800
Subject: [PATCH] feat:部门管理员功能权限控制

---
 src/main/java/com/mindskip/xzs/controller/admin/ExamTemplatesController.java |   25 ++-----------------------
 1 files changed, 2 insertions(+), 23 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 627c892..161d99d 100644
--- a/src/main/java/com/mindskip/xzs/controller/admin/ExamTemplatesController.java
+++ b/src/main/java/com/mindskip/xzs/controller/admin/ExamTemplatesController.java
@@ -1,28 +1,21 @@
 package com.mindskip.xzs.controller.admin;
 
-import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
 import com.github.pagehelper.PageInfo;
 import com.mindskip.xzs.base.BaseApiController;
 import com.mindskip.xzs.base.RestResponse;
 import com.mindskip.xzs.context.WebContext;
-import com.mindskip.xzs.domain.ExamPaper;
 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.repository.UserDepartmentMapper;
 import com.mindskip.xzs.service.ExamTemplatesService;
 import com.mindskip.xzs.utility.PageInfoHelper;
 import com.mindskip.xzs.viewmodel.admin.exam.ExamPaperEditRequestVM;
 import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
-import java.util.List;
-import java.util.Objects;
 
 @RestController("AdminExamTemplatesController")
 @RequestMapping(value = "/api/admin/exam/templates")
@@ -36,28 +29,14 @@
 
     @RequestMapping(value = "/edit", method = RequestMethod.POST)
     public RestResponse edit(@RequestBody @Valid ExamPaperEditRequestVM model) {
-        User currentUser = webContext.getCurrentUser();
-        if (Objects.nonNull(currentUser)) {
-            // 濡傛灉鏄儴闂ㄧ鐞嗗憳锛岄渶瑕佸仛鏁版嵁鏉冮檺
-            if ("1".equals(currentUser.getDeptAdmin())) {
-                Integer deptId = departmentMapper.selectByAdminId(currentUser.getId());
-                model.setDeptId(deptId);
-            }
-        }
         examTemplatesService.add(model);
         return RestResponse.ok();
     }
 
     @RequestMapping(value = "/list", method = RequestMethod.GET)
     public RestResponse<PageInfo<ExamTemplatesVO>> list(ExamTemplatesVO examTemplatesVO) throws Exception {
-        User currentUser = webContext.getCurrentUser();
-        if (Objects.nonNull(currentUser)) {
-            // 濡傛灉鏄儴闂ㄧ鐞嗗憳锛岄渶瑕佸仛鏁版嵁鏉冮檺
-            if ("1".equals(currentUser.getDeptAdmin())) {
-                Integer deptId = departmentMapper.selectByAdminId(currentUser.getId());
-                examTemplatesVO.setDeptId(deptId);
-            }
-        }
+        // 濡傛灉鏄儴闂ㄧ鐞嗗憳锛岄渶瑕佸仛鏁版嵁鏉冮檺
+        examTemplatesVO.setDeptId(isDeptAdmin() ? getAdminDeptIds() : null);
         PageInfo<ExamTemplates> pageInfo = examTemplatesService.getByadmins(examTemplatesVO);
         PageInfo<ExamTemplatesVO> info = PageInfoHelper.copyMap(pageInfo, e -> {
             ExamTemplatesVO vo = new ExamTemplatesVO();

--
Gitblit v1.8.0