From ccca8c65b3c76a9021a471a3667d61d965a4f2cb Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期六, 11 五月 2024 18:04:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/mindskip/xzs/controller/admin/DepartmentController.java |   44 +++++++++++++++++++++++++++++++++-----------
 1 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/mindskip/xzs/controller/admin/DepartmentController.java b/src/main/java/com/mindskip/xzs/controller/admin/DepartmentController.java
index ded0bc5..1d3da20 100644
--- a/src/main/java/com/mindskip/xzs/controller/admin/DepartmentController.java
+++ b/src/main/java/com/mindskip/xzs/controller/admin/DepartmentController.java
@@ -4,34 +4,43 @@
 import com.mindskip.xzs.base.BaseApiController;
 import com.mindskip.xzs.base.RestResponse;
 import com.mindskip.xzs.domain.Department;
+import com.mindskip.xzs.domain.ExamPaper;
 import com.mindskip.xzs.domain.User;
 import com.mindskip.xzs.domain.UserDepartment;
 import com.mindskip.xzs.domain.vo.BaseSelect;
 import com.mindskip.xzs.domain.vo.DepartmentVO;
 import com.mindskip.xzs.domain.vo.UpdateDeptAdminVO;
 import com.mindskip.xzs.domain.vo.UserVO;
+import com.mindskip.xzs.repository.DepartmentMapper;
 import com.mindskip.xzs.repository.UserDepartmentMapper;
 import com.mindskip.xzs.service.DepartmentService;
 import com.mindskip.xzs.service.UserService;
 import com.mindskip.xzs.utility.PageInfoHelper;
 import com.mindskip.xzs.viewmodel.admin.department.DepartmentResponseVM;
+import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 
 @RestController("AdminDepartmentController")
 @RequestMapping("/api/admin/department")
+@RequiredArgsConstructor
 public class DepartmentController extends BaseApiController {
 
 
     private final DepartmentService departmentService;
     private final UserService userService;
     private final UserDepartmentMapper userDepartmentMapper;
+    private final DepartmentMapper departmentMapper;
+
+
 
     /**
      * 鑾峰彇閮ㄩ棬涓嬬敤鎴峰垪琛�(涓嬫媺)
@@ -51,16 +60,9 @@
         return RestResponse.ok();
     }
 
-    @Autowired
-    public DepartmentController(DepartmentService departmentService, UserService userService, UserDepartmentMapper userDepartmentMapper) {
-        this.departmentService = departmentService;
-        this.userService = userService;
-        this.userDepartmentMapper = userDepartmentMapper;
-    }
-
     @RequestMapping(value = "/list", method = RequestMethod.POST)
     public RestResponse<List<Department>> getAll(){
-        List<Department> res = departmentService.gets();
+        List<Department> res = departmentService.gets(-1);
         return RestResponse.ok(res);
     }
 
@@ -92,14 +94,34 @@
     }
 
     @RequestMapping(value = "/getDepartmentUser", method = RequestMethod.POST)
-    public RestResponse<List<DepartmentVO>> getUserDepartment(){
-        List<DepartmentVO> res = departmentService.gets()
+    public RestResponse<List<DepartmentVO>> getUserDepartment(Integer examPaperId){
+        User currentUser = webContext.getCurrentUser();
+        Integer deptId = null;
+        if (Objects.nonNull(currentUser)) {
+            // 濡傛灉鏄儴闂ㄧ鐞嗗憳锛岄渶瑕佸仛鏁版嵁鏉冮檺
+            if ("1".equals(currentUser.getDeptAdmin())) {
+                deptId = departmentMapper.selectByAdminId(currentUser.getId());
+            }
+        }
+        List<DepartmentVO> res = departmentService.gets(deptId)
                 .stream().map(e->{
                     DepartmentVO departmentVO = new DepartmentVO();
                     List<UserDepartment> userDepartments = userDepartmentMapper.selectByDepartmentId(e.getId());
                     List<User> list = new ArrayList<>();
                     for (UserDepartment userDepartment : userDepartments) {
-                        list.add(userService.getUserById(userDepartment.getUserId()));
+                        User user;
+                        // 閫夋嫨琛ヨ�冪敤鎴锋椂鏌ヨ绗﹀悎琛ヨ�冩潯浠剁殑鐢ㄦ埛
+                        if (examPaperId != null) {
+                            ExamPaper examPaper = new ExamPaper();
+                            examPaper.setCreateUser(userDepartment.getUserId());
+                            examPaper.setId(examPaperId);
+                            user = userService.getUserByExam(examPaper);
+                        } else {
+                            user = userService.getUserById(userDepartment.getUserId());
+                        }
+                        if (ObjectUtils.isNotEmpty(user)) {
+                            list.add(user);
+                        }
                     }
                     departmentVO.setUserList(list);
                     departmentVO.setDepartment(e);

--
Gitblit v1.8.0