RuoYi
2022-12-03 3b8a68c4cf99abc789fb5b13f9017593298c8fe1
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
@@ -161,14 +161,15 @@
    /**
     * 校验用户名称是否唯一
     * 
     * @param userName 用户名称
     * @param user 用户信息
     * @return 结果
     */
    @Override
    public String checkUserNameUnique(String userName)
    public String checkUserNameUnique(SysUser user)
    {
        int count = userMapper.checkUserNameUnique(userName);
        if (count > 0)
        Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
        SysUser info = userMapper.checkUserNameUnique(user.getUserName());
        if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue())
        {
            return UserConstants.NOT_UNIQUE;
        }
@@ -381,7 +382,7 @@
     */
    public void insertUserRole(SysUser user)
    {
        this.insertUserRole(user.getUserId, user.getRoleIds());
        this.insertUserRole(user.getUserId(), user.getRoleIds());
    }
    /**
@@ -507,6 +508,8 @@
                else if (isUpdateSupport)
                {
                    BeanValidators.validateWithException(validator, user);
                    checkUserAllowed(user);
                    checkUserDataScope(user.getUserId());
                    user.setUpdateBy(operName);
                    this.updateUser(user);
                    successNum++;