Merge remote-tracking branch 'origin/master'

xiangpei

2024-07-16 fc36338476ccb0e8fa641794de4022f300f59a2e

Merge remote-tracking branch 'origin/master'

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

@@ -1,6 +1,5 @@
package com.mindskip.xzs.controller.admin;

import com.github.pagehelper.PageInfo;
import com.mindskip.xzs.base.BaseApiController;
import com.mindskip.xzs.base.RestResponse;
import com.mindskip.xzs.domain.Department;
@@ -155,4 +154,9 @@
        return RestResponse.ok(departmentService.cascader());
    }

    @GetMapping("/getCurrentDeptId")
    public RestResponse<List<Integer>> getCurrentDeptIds(){
        return RestResponse.ok(getAdminDeptIds());
    }

}

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

@@ -138,16 +138,18 @@
        }
        Map<Integer, UserDepartment> oldDeptUser = userDepartmentMapper.selectByUserId(user.getId()).stream().collect(Collectors.toMap(UserDepartment::getDepartmentId, userDept -> userDept));
        userDepartmentMapper.removeByUserId(user.getId());
        for (Integer s : model.getDeptIds()) {
            UserDepartment userDepartment = new UserDepartment();
            userDepartment.setUserId(user.getId());
            userDepartment.setDepartmentId(s);
            if (Objects.nonNull(oldDeptUser.get(s))) {
                userDepartment.setDeptAdmin(oldDeptUser.get(s).getDeptAdmin());
            } else {
                userDepartment.setDeptAdmin("0");
        if (ObjectUtils.isNotEmpty(model.getDeptIds())) {
            for (Integer s : model.getDeptIds()) {
                UserDepartment userDepartment = new UserDepartment();
                userDepartment.setUserId(user.getId());
                userDepartment.setDepartmentId(s);
                if (Objects.nonNull(oldDeptUser.get(s))) {
                    userDepartment.setDeptAdmin(oldDeptUser.get(s).getDeptAdmin());
                } else {
                    userDepartment.setDeptAdmin("0");
                }
                userDepartmentMapper.insert(userDepartment);
            }
            userDepartmentMapper.insert(userDepartment);
        }
        tagService.removeUserTagByUserId(user.getId());
        if (ObjectUtils.isNotEmpty(model.getTagIds())) {

 src/main/resources/mapper/ExamPaperAnswerMapper.xml

@@ -532,7 +532,7 @@
        LEFT JOIN t_user_department b ON a.id = b.department_id
        LEFT JOIN t_exam_templates_user d ON d.user_id = b.user_id AND d.templates_id = #{id}
        LEFT JOIN t_exam_templates_user_count e ON d.templates_id = e.exam_templates_id
        LEFT JOIN t_exam_paper_answer c ON d.user_id = c.create_user AND e.exam_paper_id = c.exam_paper_id AND (c.invalid = 0 OR c.invalid IS NULL)
        INNER JOIN t_exam_paper_answer c ON d.user_id = c.create_user AND e.exam_paper_id = c.exam_paper_id AND (c.invalid = 0 OR c.invalid IS NULL)
    WHERE a.deleted = 0
    GROUP BY
      a.id, a.name
@@ -590,7 +590,7 @@
    FROM
      t_department a
        LEFT JOIN t_user_department b ON a.id = b.department_id
        LEFT JOIN t_exam_paper_answer c ON b.user_id = c.create_user AND (c.invalid = 0 OR c.invalid IS NULL) AND c.exam_paper_id = #{id}
        INNER JOIN t_exam_paper_answer c ON b.user_id = c.create_user AND (c.invalid = 0 OR c.invalid IS NULL) AND c.exam_paper_id = #{id}
        LEFT JOIN t_exam_paper_user d ON b.user_id = d.user_id AND d.exam_paper_id = #{id}
    WHERE a.deleted = 0
    GROUP BY