From 8f128cdf03c1aea60535305d51f5536e9aef83a6 Mon Sep 17 00:00:00 2001 From: 龚焕茏 <2842157468@qq.com> Date: 星期二, 16 七月 2024 10:42:20 +0800 Subject: [PATCH] feat:管理员打标签、只统计参考的部门 --- src/main/java/com/mindskip/xzs/controller/admin/UserController.java | 20 +++++++++++--------- src/main/resources/mapper/ExamPaperAnswerMapper.xml | 4 ++-- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/mindskip/xzs/controller/admin/UserController.java b/src/main/java/com/mindskip/xzs/controller/admin/UserController.java index d155005..63a9b14 100644 --- a/src/main/java/com/mindskip/xzs/controller/admin/UserController.java +++ b/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())) { diff --git a/src/main/resources/mapper/ExamPaperAnswerMapper.xml b/src/main/resources/mapper/ExamPaperAnswerMapper.xml index 9103800..a5db441 100644 --- a/src/main/resources/mapper/ExamPaperAnswerMapper.xml +++ b/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 -- Gitblit v1.8.0