Merge remote-tracking branch 'origin/master'

xiangpei

2024-07-02 a6a3bb04cdaa334a2868d09b20518ed98575bccb

 src/main/java/com/mindskip/xzs/controller/admin/DepartmentController.java

@@ -118,6 +118,35 @@
        return RestResponse.ok(res);
    }

    @RequestMapping(value = "/getDepartmentUserByTemplateId", method = RequestMethod.POST)
    public RestResponse<List<DepartmentVO>> getDepartmentUserByTemplateId(Integer templateId){
        List<DepartmentVO> res = departmentService.gets(isDeptAdmin() ? getAdminDeptIds() : null)
                .stream().map(e->{
                    DepartmentVO departmentVO = new DepartmentVO();
                    List<UserDepartment> userDepartments = userDepartmentMapper.selectByDepartmentId(e.getId());
                    List<User> list = new ArrayList<>();
                    for (UserDepartment userDepartment : userDepartments) {
                        User user;
                        // 选择补考用户时查询符合补考条件的用户
                        if (templateId != null) {
                            ExamPaper examPaper = new ExamPaper();
                            examPaper.setCreateUser(userDepartment.getUserId());
                            examPaper.setId(templateId);
                            user = userService.getUserByExamByTemplateId(examPaper);
                        } else {
                            user = userService.getUserById(userDepartment.getUserId());
                        }
                        if (ObjectUtils.isNotEmpty(user)) {
                            list.add(user);
                        }
                    }
                    departmentVO.setUserList(list);
                    departmentVO.setDepartment(e);
                    return departmentVO;
                }).collect(Collectors.toList());
        return RestResponse.ok(res);
    }

    @RequestMapping(value = "/getDeptAdmins", method = RequestMethod.GET)
    public RestResponse<List<Department>> getDeptAdmins(){
        return RestResponse.ok(userService.getDeptAdmins(isDeptAdmin() ? getCurrentUser().getId() : null));