兰宝车间质量管理系统
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
疯狂的狮子li
2021-10-15 a6fb88d74c20cc28043d75e8a5097fce49cf9a78 
 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java


@@ -31,7 +31,7 @@


/**


 * 用户 业务层处理


 *


 * @author ruoyi


 * @author Lion Li


 */


@Slf4j


@Service


@@ -79,7 +79,7 @@


    @Override


    @DataScope(deptAlias = "d", userAlias = "u", isUser = true)


    public TableDataInfo<SysUser> selectAllocatedList(SysUser user) {


      return PageUtils.buildDataInfo(baseMapper.selectAllocatedList(PageUtils.buildPage(), user));


        return PageUtils.buildDataInfo(baseMapper.selectAllocatedList(PageUtils.buildPage(), user));


    }




    /**


@@ -91,7 +91,7 @@


    @Override


    @DataScope(deptAlias = "d", userAlias = "u", isUser = true)


    public TableDataInfo<SysUser> selectUnallocatedList(SysUser user) {


      return PageUtils.buildDataInfo(baseMapper.selectUnallocatedList(PageUtils.buildPage(), user));


        return PageUtils.buildDataInfo(baseMapper.selectUnallocatedList(PageUtils.buildPage(), user));


    }




    /**


@@ -258,7 +258,7 @@


     * @param user 用户信息


     * @return 结果


     */


   @Override


    @Override


    public boolean registerUser(SysUser user) {


        return baseMapper.insert(user) > 0;


    }


@@ -274,11 +274,11 @@


    public int updateUser(SysUser user) {


        Long userId = user.getUserId();


        // 删除用户与角色关联


        userRoleMapper.delete(new LambdaQueryWrapper<SysUserRole>().eq(SysUserRole::getUserId,userId));


        userRoleMapper.delete(new LambdaQueryWrapper<SysUserRole>().eq(SysUserRole::getUserId, userId));


        // 新增用户与角色管理


        insertUserRole(user);


        // 删除用户与岗位关联


        userPostMapper.delete(new LambdaQueryWrapper<SysUserPost>().eq(SysUserPost::getUserId,userId));


        userPostMapper.delete(new LambdaQueryWrapper<SysUserPost>().eq(SysUserPost::getUserId, userId));


        // 新增用户与岗位管理


        insertUserPost(user);


        return baseMapper.updateById(user);


@@ -287,15 +287,14 @@


    /**


     * 用户授权角色


     *


     * @param userId 用户ID


     * @param userId  用户ID


     * @param roleIds 角色组


     */


    @Override


    @Transactional


    public void insertUserAuth(Long userId, Long[] roleIds)


    {


    public void insertUserAuth(Long userId, Long[] roleIds) {


        userRoleMapper.delete(new LambdaQueryWrapper<SysUserRole>()


         .eq(SysUserRole::getUserId, userId));


                .eq(SysUserRole::getUserId, userId));


        insertUserRole(userId, roleIds);


    }




@@ -325,15 +324,15 @@


     * 修改用户头像


     *


     * @param userName 用户名


     * @param avatar 头像地址


     * @param avatar   头像地址


     * @return 结果


     */


    @Override


    public boolean updateUserAvatar(String userName, String avatar) {


        return baseMapper.update(null,


                new LambdaUpdateWrapper<SysUser>()


                        .set(SysUser::getAvatar,avatar)


                        .eq(SysUser::getUserName,userName)) > 0;


                        .set(SysUser::getAvatar, avatar)


                        .eq(SysUser::getUserName, userName)) > 0;


    }




    /**


@@ -358,8 +357,8 @@


    public int resetUserPwd(String userName, String password) {


        return baseMapper.update(null,


                new LambdaUpdateWrapper<SysUser>()


                        .set(SysUser::getPassword,password)


                        .eq(SysUser::getUserName,userName));


                        .set(SysUser::getPassword, password)


                        .eq(SysUser::getUserName, userName));


    }




    /**


@@ -379,7 +378,7 @@


                list.add(ur);


            }


            if (list.size() > 0) {


            userRoleMapper.insertAll(list);


                userRoleMapper.insertAll(list);


            }


        }


    }


@@ -401,7 +400,7 @@


                list.add(up);


            }


            if (list.size() > 0) {


            userPostMapper.insertAll(list);


                userPostMapper.insertAll(list);


            }


        }


    }


@@ -409,7 +408,7 @@


    /**


     * 新增用户角色信息


     *


     * @param userId 用户ID


     * @param userId  用户ID


     * @param roleIds 角色组


     */


    public void insertUserRole(Long userId, Long[] roleIds) {


@@ -438,9 +437,9 @@


    @Transactional


    public int deleteUserById(Long userId) {


        // 删除用户与角色关联


        userRoleMapper.delete(new LambdaQueryWrapper<SysUserRole>().eq(SysUserRole::getUserId,userId));


        userRoleMapper.delete(new LambdaQueryWrapper<SysUserRole>().eq(SysUserRole::getUserId, userId));


        // 删除用户与岗位表


        userPostMapper.delete(new LambdaQueryWrapper<SysUserPost>().eq(SysUserPost::getUserId,userId));


        userPostMapper.delete(new LambdaQueryWrapper<SysUserPost>().eq(SysUserPost::getUserId, userId));


        return baseMapper.deleteById(userId);


    }




@@ -458,18 +457,18 @@


        }


        List<Long> ids = Arrays.asList(userIds);


        // 删除用户与角色关联


        userRoleMapper.delete(new LambdaQueryWrapper<SysUserRole>().in(SysUserRole::getUserId,ids));


        userRoleMapper.delete(new LambdaQueryWrapper<SysUserRole>().in(SysUserRole::getUserId, ids));


        // 删除用户与岗位表


        userPostMapper.delete(new LambdaQueryWrapper<SysUserPost>().in(SysUserPost::getUserId,ids));


        userPostMapper.delete(new LambdaQueryWrapper<SysUserPost>().in(SysUserPost::getUserId, ids));


        return baseMapper.deleteBatchIds(ids);


    }




    /**


     * 导入用户数据


     *


     * @param userList 用户数据列表


     * @param userList        用户数据列表


     * @param isUpdateSupport 是否更新支持，如果已存在，则进行更新数据


     * @param operName 操作用户


     * @param operName        操作用户


     * @return 结果


     */


    @Override