ENGCOM-8722: fix for ambigous column user_id in where clause #31205

Author: gabrieldagama

app/code/Magento/User/Model/ResourceModel/User/Collection.php

@@ -41,5 +41,6 @@ protected function _initSelect()
             'user_role.parent_id = detail_role.role_id',
             ['role_name']
         );
+		$this->addFilterToMap('user_id', 'main_table.user_id');
     }
 }

dev/tests/integration/testsuite/Magento/User/Model/ResourceModel/User/CollectionTest.php

@@ -0,0 +1,30 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\User\Model\ResourceModel\User;
+
+/**
+ * User collection test
+ * @magentoAppArea adminhtml
+ */
+class CollectionTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\User\Model\ResourceModel\User\Collection
+     */
+    protected $_collection;
+
+    protected function setUp(): void
+    {
+        $this->_collection = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+            \Magento\User\Model\ResourceModel\User\Collection::class
+        );
+    }
+
+    public function testFilteringCollectionByUserId()
+    {
+        $this->assertEquals(1, $this->_collection->addFieldToFilter('user_id', 1)->count());
+    }
+}