From 0298e1107634c1b68200a58eb23499fbb95548a3 Mon Sep 17 00:00:00 2001 From: Babak Alizadeh Date: Fri, 14 Feb 2025 05:40:40 +0000 Subject: [PATCH] bug fix in person card export --- .../src/Controller/PersonsController.php | 28 ++++++++----------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/hesabixCore/src/Controller/PersonsController.php b/hesabixCore/src/Controller/PersonsController.php index 65a9b51..40da3f9 100644 --- a/hesabixCore/src/Controller/PersonsController.php +++ b/hesabixCore/src/Controller/PersonsController.php @@ -796,24 +796,22 @@ class PersonsController extends AbstractController if (!$person) throw $this->createNotFoundException(); if (!array_key_exists('items', $params)) { - $transactions = $entityManager->getRepository(HesabdariRow::class)->findBy([ + $transactions = $entityManager->getRepository(HesabdariRow::class)->findByJoinMoney([ 'bid' => $acc['bid'], 'person' => $person, 'year' => $acc['year'], - 'money' => $acc['money'], - ]); + ], $acc['money']); } else { $transactions = []; foreach ($params['items'] as $param) { - $prs = $entityManager->getRepository(HesabdariRow::class)->findOneBy([ + $prs = $entityManager->getRepository(HesabdariRow::class)->findByJoinMoney([ 'id' => $param['id'], 'bid' => $acc['bid'], 'person' => $person, 'year' => $acc['year'], - 'money' => $acc['money'], - ]); - if ($prs) { - $transactions[] = $prs; + ], $acc['money']); + if (count($prs) != 0) { + $transactions[] = $prs[0]; } } } @@ -866,24 +864,22 @@ class PersonsController extends AbstractController throw $this->createNotFoundException(); if (!array_key_exists('items', $params)) { - $transactions = $entityManager->getRepository(HesabdariRow::class)->findBy([ + $transactions = $entityManager->getRepository(HesabdariRow::class)->findByJoinMoney([ 'bid' => $acc['bid'], 'person' => $person, 'year' => $acc['year'], - 'money' => $acc['money'], - ]); + ], $acc['money']); } else { $transactions = []; foreach ($params['items'] as $param) { - $prs = $entityManager->getRepository(HesabdariRow::class)->findOneBy([ + $prs = $entityManager->getRepository(HesabdariRow::class)->findByJoinMoney([ 'id' => $param['id'], 'bid' => $acc['bid'], 'person' => $person, 'year' => $acc['year'], - 'money' => $acc['money'], - ]); - if ($prs) { - $transactions[] = $prs; + ], $acc['money']); + if (count($prs) != 0) { + $transactions[] = $prs[0]; } } }