Fixed store switcher not work multistore setup with different product urls issue

Author: Janak

app/code/Magento/UrlRewrite/Model/StoreSwitcher/RewriteUrl.php

@@ -67,13 +67,19 @@ public function switch(StoreInterface $fromStore, StoreInterface $targetStore, s
         ]);
         if ($oldRewrite) {
             // look for url rewrite match on the target store
-            $currentRewrite = $this->urlFinder->findOneByData([
-                UrlRewrite::REQUEST_PATH => $urlPath,
+            $currentRewrites = $this->urlFinder->findAllByData([
+                UrlRewrite::TARGET_PATH => $oldRewrite->getTargetPath(),
                 UrlRewrite::STORE_ID => $targetStore->getId(),
             ]);
-            if (null === $currentRewrite) {
+
+            if (null === $currentRewrites || empty($currentRewrites)) {
                 /** @var \Magento\Framework\App\Response\Http $response */
                 $targetUrl = $targetStore->getBaseUrl();
+            } else {
+                foreach($currentRewrites as $rewrite) {
+                    $targetUrl = $targetStore->getBaseUrl() . $rewrite->getRequestPath();
+                    break;
+                }
             }
         }