From 0998ce436077817f7a2855a70086ea1065ac76ae Mon Sep 17 00:00:00 2001 From: JiaJia Ji Date: Tue, 14 Jan 2025 12:16:16 +0100 Subject: [PATCH] [Bug]: CMF Admin Customer List export id ambiguity (#548) --- src/Controller/Admin/CustomersController.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/Controller/Admin/CustomersController.php b/src/Controller/Admin/CustomersController.php index e331d304..e35503df 100644 --- a/src/Controller/Admin/CustomersController.php +++ b/src/Controller/Admin/CustomersController.php @@ -164,9 +164,10 @@ public function exportAction(Request $request): JsonResponse $listing = $this->buildListing($filters); $idField = Service::getVersionDependentDatabaseColumnName('id'); + $fromTable = $listing->getQueryBuilder()->getQueryPart('from')[0]['table']; $query = $listing->getQueryBuilder() ->resetQueryPart('select') - ->select($idField); + ->select($fromTable . '.' . $idField); $ids = Db::get()->fetchFirstColumn((string)$query); $jobId = uniqid(); @@ -218,7 +219,9 @@ public function exportStepAction(Request $request): JsonResponse $idField = Service::getVersionDependentDatabaseColumnName('id'); $listing = $this->buildListing(); - $listing->addConditionParam($idField . ' in ('.implode(', ', $ids).')'); + + $fromTable = $listing->getQueryBuilder()->getQueryPart('from')[0]['table']; + $listing->addConditionParam($fromTable . '.' . $idField . ' in ('.implode(', ', $ids).')'); $exporter = $this->getExporter($listing, $data['exporter']); $exportData = $exporter->getExportData();