修改了登录的代码1

feige

2024-08-30 3ce299ce3e9db1342b519dd8d8b9062c7f99eeea

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -60,6 +60,9 @@
    private SysUserRoleMapper userRoleMapper;

    @Autowired
    private SysUserRoleMapper sysUserRoleMapper;

    @Autowired
    private SysUserPostMapper userPostMapper;

    @Autowired
@@ -132,6 +135,11 @@
        return userMapper.selectUserByUserName(userName);
    }

    @Override
    public SysUser selectUserByNickName(String nickName) {
        return userMapper.selectUserByNickName(nickName);
    }

    /**
     * 通过用户ID查询用户
     * 
@@ -189,6 +197,17 @@
    {
        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;
        }
        return UserConstants.UNIQUE;
    }

    @Override
    public boolean checkNickNameUnique(SysUser user) {
        Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
        SysUser info = userMapper.checkNickNameUnique(user.getNickName());
        if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue())
        {
            return UserConstants.NOT_UNIQUE;
@@ -254,6 +273,7 @@
    @Override
    public void checkUserDataScope(Long userId)
    {
        //判断是否是管理员
        if (!SysUser.isAdmin(SecurityUtils.getUserId()))
        {
            SysUser user = new SysUser();
@@ -296,8 +316,16 @@
    @Override
    public boolean registerUser(SysUser user)
    {
        System.out.println(user);
        return userMapper.insertUser(user) > 0;
        int satisfyCount = userMapper.insertUser(user);
        if (satisfyCount > 0) {
            List<SysUserRole> roleList = new ArrayList<>();
            SysUserRole roleId = new SysUserRole();
            roleId.setUserId(user.getUserId());
            roleId.setRoleId(2L);
            roleList.add(roleId);
            sysUserRoleMapper.batchUserRole(roleList);
        }
        return satisfyCount > 0;
    }

    /**
@@ -539,6 +567,8 @@
        StringBuilder successMsg = new StringBuilder();
        StringBuilder failureMsg = new StringBuilder();
        String password = configService.selectConfigByKey("sys.user.initPassword");
        List<SysUserRole> roleList = new ArrayList<>();

        for (SysUser user : userList)
        {
            try
@@ -551,7 +581,12 @@
                    user.setPassword(SecurityUtils.encryptPassword(password));
                    user.setCreateBy(operName);
                    this.insertUser(user);
                    SysUserRole roleId = new SysUserRole();
                    roleId.setUserId(user.getUserId());
                    roleId.setRoleId(2L);
                    roleList.add(roleId);
                    successNum++;

                    successMsg.append("<br/>" + successNum + "、账号 " + user.getUserName() + " 导入成功");
                }
                else if (isUpdateSupport)
@@ -578,6 +613,7 @@
                log.error(msg, e);
            }
        }
        sysUserRoleMapper.batchUserRole(roleList);
        if (failureNum > 0)
        {
            failureMsg.insert(0, "很抱歉，导入失败！共 " + failureNum + " 条数据格式不正确，错误如下：");