xiangpei
2025-05-14 47cd9ecc0eff38ffe6b3b794b2bf197e958f4403
src/main/java/com/mindskip/xzs/controller/admin/UserController.java
@@ -82,7 +82,7 @@
    @RequestMapping(value = "/select/{id}", method = RequestMethod.POST)
    public RestResponse<UserResponseVM> select(@PathVariable Integer id) {
        User user = userService.getUserById(id);
        User user = userService.getUserInfoById(id);
        UserResponseVM userVm = UserResponseVM.from(user);
        List<UserDepartment> userDepartments = userDepartmentMapper.selectByUserId(user.getId());
        String deptIds = "";
@@ -138,19 +138,21 @@
        }
        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())) {
            tagService.removeUserTagByUserId(user.getId());
            tagService.saveBatchUserTag(model.getTagIds().stream().map(
                    tagId -> new UserTag() {{
                        setUserId(user.getId());
@@ -186,7 +188,7 @@
    @RequestMapping(value = "/delete/{id}", method = RequestMethod.POST)
    public RestResponse delete(@PathVariable Integer id) {
        User user = userService.getUserById(id);
        User user = userService.getUserInfoById(id);
        user.setDeleted(true);
        userService.updateByIdFilter(user);
        return RestResponse.ok();
@@ -231,4 +233,14 @@
        return RestResponse.ok();
    }
    @GetMapping("/getFailExamUser/{examPaperId}")
    public RestResponse<List<User>> getFailExamUser(@PathVariable Integer examPaperId) {
        return RestResponse.ok(userService.getFailExamUser(examPaperId));
    }
    @GetMapping("/getFailTemplateUser/{templateId}")
    public RestResponse<List<User>> getFailTemplateUser(@PathVariable Integer templateId) {
        return RestResponse.ok(userService.getFailTemplateUser(templateId));
    }
}