Merge remote-tracking branch 'origin/master'

xiangpei

2024-07-12 1b5162ebb83ffc13e5c196ccd135ae5f98701edd

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

@@ -50,9 +50,7 @@
    @RequestMapping(value = "/page/list", method = RequestMethod.POST)
    public RestResponse<PageInfo<UserResponseVM>> pageList(@RequestBody UserPageRequestVM model) {
        model.setDepartmentId(ObjectUtils.isNotEmpty(model.getDepartmentId()) ? model.getDepartmentId() : getAdminDeptIds());
        PageInfo<User> pageInfo = userService.userPage(model);
        PageInfo<UserResponseVM> page = PageInfoHelper.copyMap(pageInfo, d ->
                UserResponseVM.from(d));
        PageInfo<UserResponseVM> page = userService.userPage(model);
        page.setList(page.getList().stream().map(e->{
            List<UserDepartment> userDepartments = userDepartmentMapper.selectByUserId(e.getId());
            List<Department> list = new ArrayList<>();
@@ -151,8 +149,8 @@
            }
            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());
@@ -233,4 +231,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));
    }

}