Merge remote-tracking branch 'origin/master'

huanghongfa

2021-04-20 4e8be752d24ae22362455c16f75d3bcbccb23359

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java

@@ -1560,8 +1560,10 @@
    }

    @Override
    public R getSysUserVOByAccount(String account) {
        SysUserDO sysUserDO = userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getAccount, account));
    public R getSysUserVOByAccount(String account, Integer type) {
        LambdaQueryWrapper<SysUserDO> query = new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getAccount, account);
        query.eq(SysUserDO::getType, type);
        SysUserDO sysUserDO = userDao.selectOne(query);
        if (ObjectUtils.isEmpty(sysUserDO)) {
            return R.fail("用户不存在");
        }