判断shopId是否为空

@@ -355,7 +355,7 @@ class IndexController extends WebAction
             $this->go(SITE_MAIN);
             $this->go(SITE_MAIN);
         }
         }
 
 
-        $shopId = isset($result['shopId']) ? $result['shopId'] : $this->get('shopId', 0);
+        $shopId = empty($result['shopId']) ? $this->get('shopId', 0) : $result['shopId'];
         //获取uid
         //获取uid
         $uid = $this->getUid();
         $uid = $this->getUid();
 
 
@@ -372,7 +372,7 @@ class IndexController extends WebAction
             ),
             ),
             'uid' => $uid,
             'uid' => $uid,
             'navBar' => $this->get('navBar', 1),
             'navBar' => $this->get('navBar', 1),
-            'shopId' => $shopId,
+            'shopId' => $this->get('shopId', 0),
             'brand' => $this->get('brand', 0)
             'brand' => $this->get('brand', 0)
         );
         );