diff --git a/app/appfront/modules/Catalog/block/reviewproduct/Lists.php b/app/appfront/modules/Catalog/block/reviewproduct/Lists.php
index a439557bc..c26890282 100644
--- a/app/appfront/modules/Catalog/block/reviewproduct/Lists.php
+++ b/app/appfront/modules/Catalog/block/reviewproduct/Lists.php
@@ -76,7 +76,8 @@ public function getLastData()
     {
         $this->initParam();
         if (!$this->spu || !$this->product_id) {
-            return;
+            Yii::$service->page->message->addError('param spu and _id is require');
+            return [];
         }
         $product = Yii::$service->product->getByPrimaryKey($this->product_id);
         if (!$product['spu']) {
@@ -118,6 +119,7 @@ public function getLastData()
                 'url'               => Yii::$service->url->getUrl($url_key),
             ];
         }
+        return [];
     }
     /**
      * @property $spu  | String
diff --git a/app/appfront/modules/Customer/controllers/AccountController.php b/app/appfront/modules/Customer/controllers/AccountController.php
index 794b71ebe..14354ac3a 100644
--- a/app/appfront/modules/Customer/controllers/AccountController.php
+++ b/app/appfront/modules/Customer/controllers/AccountController.php
@@ -113,8 +113,6 @@ public function actionLogout()
         }
         if ($rt) {
             $redirectUrl = base64_decode($rt);
-            $redirectUrl = \Yii::$service->helper->htmlEncode($redirectUrl);
-            //exit;
             Yii::$service->url->redirect($redirectUrl);
         } else {
             Yii::$service->url->redirect(Yii::$service->url->HomeUrl());
diff --git a/services/Customer.php b/services/Customer.php
index f365dce51..a4e610e01 100644
--- a/services/Customer.php
+++ b/services/Customer.php
@@ -381,6 +381,7 @@ protected function actionLoginSuccessRedirect($urlKey = '')
             Yii::$service->session->remove($this::USER_LOGIN_SUCCESS_REDIRECT_URL_KEY);
             //echo Yii::$service->session->get($this::USER_LOGIN_SUCCESS_REDIRECT_URL_KEY);
             //exit;
+            $url = urldecode($url);
             return Yii::$service->url->redirect($url);
         } else if($urlKey) {
             return Yii::$service->url->redirectByUrlKey($urlKey);