龚焕茏
2024-07-16 219cf838792ab0d50dd042d0fb8c60dd3a1e76f8
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())) {