店铺内搜索跳转到其他店铺

@@ -36,7 +36,7 @@ class SearchController extends AbstractAction
     {
         // 过滤请求参数
         $condition = filter_input_array(INPUT_GET, array(
-            'shop' => FILTER_DEFAULT,
+            'shop_id' => FILTER_DEFAULT,
             'categoryId' => FILTER_DEFAULT,
             'subCategoryId' => FILTER_DEFAULT,
             'title' => FILTER_DEFAULT,
@@ -105,7 +105,7 @@ class SearchController extends AbstractAction
             $brandNames = array();
 
             // 跳转到品牌商品列表页
-            if ($domain !== null) {
+            if ($domain !== null && empty($condition['shop_id'])) {
                 $url = Helpers::url('', array(
                     'from' => 'search',
                     'query' => $query