修改了登录的代码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
@@ -73,7 +76,9 @@

    @Override
    public List<String> findUserNames(Long[] ids) {
        List<String> usNames = userMapper.findUserNames(ids);
        List<String> usNames = userMapper.findUserNames(ids).stream().map(SysUser::getUserName).collect(Collectors.toList());
                //.stream().map(SysUser::getUserName).collect(Collectors.toList());;
        System.out.println("99999999999900000000000");
        System.out.println(usNames);
                //.stream().map(SysUser::getUserName).collect(Collectors.toList());
        return usNames;
@@ -128,6 +133,11 @@
    public SysUser selectUserByUserName(String userName)
    {
        return userMapper.selectUserByUserName(userName);
    }

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

    /**
@@ -194,6 +204,17 @@
        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;
        }
        return UserConstants.UNIQUE;
    }

    /**
     * 校验手机号码是否唯一
     *
@@ -252,6 +273,7 @@
    @Override
    public void checkUserDataScope(Long userId)
    {
        //判断是否是管理员
        if (!SysUser.isAdmin(SecurityUtils.getUserId()))
        {
            SysUser user = new SysUser();
@@ -294,7 +316,16 @@
    @Override
    public boolean registerUser(SysUser 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;
    }

    /**
@@ -309,9 +340,9 @@
    {
        Long userId = user.getUserId();
        // 删除用户与角色关联
        userRoleMapper.deleteUserRoleByUserId(userId);
        // 新增用户与角色管理
        insertUserRole(user);
//        userRoleMapper.deleteUserRoleByUserId(userId);
//        // 新增用户与角色管理
//        insertUserRole(user);
        // 删除用户与岗位关联
        userPostMapper.deleteUserPostByUserId(userId);
        // 新增用户与岗位管理
@@ -469,7 +500,7 @@
        userRoleMapper.deleteUserRoleByUserId(userId);
        // 删除用户与岗位表
        userPostMapper.deleteUserPostByUserId(userId);
        return userMapper.deleteUserById(userId);
        return userMapper.deleteById(userId);
    }

    /**
@@ -491,7 +522,29 @@
        userRoleMapper.deleteUserRole(userIds);
        // 删除用户与岗位关联
        userPostMapper.deleteUserPost(userIds);
        return userMapper.deleteUserByIds(userIds);
        //找到用户名

        for(long uid : userIds) {
          //  System.out.println(name.equals(""));
         //   System.out.println(name==null);

         //   if(name!="" || name != null) {
                ZInfoUser fs = zInfoUserService.getInfoBysysId(uid);

                if(fs!=null)
                {
                    userMapper.deleteUserById(uid);
                }
                else
                {
                    userMapper.deleteById(uid);
                }
          //  }
        }

        return 1;
//        zInfoUserService.removeByUserName( findUserNames(userIds));

    }

    /**
@@ -514,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
@@ -526,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)
@@ -553,6 +613,7 @@
                log.error(msg, e);
            }
        }
        sysUserRoleMapper.batchUserRole(roleList);
        if (failureNum > 0)
        {
            failureMsg.insert(0, "很抱歉，导入失败！共 " + failureNum + " 条数据格式不正确，错误如下：");