From f3398c7dec94206617fff643c780dfd0674ce1f9 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 17 Dec 2016 17:09:46 +0100 Subject: [PATCH] This fixes #472 --- app/Import/ImportStorage.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/Import/ImportStorage.php b/app/Import/ImportStorage.php index 8b4986a9fe..ce13b7b381 100644 --- a/app/Import/ImportStorage.php +++ b/app/Import/ImportStorage.php @@ -113,7 +113,11 @@ class ImportStorage private function alreadyImported(string $hash): TransactionJournal { - $meta = TransactionJournalMeta::where('name', 'originalImportHash')->where('data', json_encode($hash))->first(['journal_meta.*']); + $meta = TransactionJournalMeta + ::leftJoin('transaction_journals', 'transaction_journals.id', '=', 'journal_meta.transaction_journal_id') + ->where('journal_meta.name', 'originalImportHash') + ->where('transaction_journals.user_id', $this->user->id) + ->where('journal_meta.data', json_encode($hash))->first(['journal_meta.*']); if (!is_null($meta)) { /** @var TransactionJournal $journal */ $journal = $meta->transactionjournal;