diff --git a/app/controller/api/store/merchant/MerchantIntention.php b/app/controller/api/store/merchant/MerchantIntention.php
index 4fe0bdc0..db493995 100644
--- a/app/controller/api/store/merchant/MerchantIntention.php
+++ b/app/controller/api/store/merchant/MerchantIntention.php
@@ -48,7 +48,7 @@ class MerchantIntention extends BaseController
         if ($this->userInfo) $data['uid'] = $this->userInfo->uid;
         $merInfo = Db::name('merchant')->where('uid', $this->userInfo->uid)->where('status', 1)->find();
         if ($merInfo) {
-            //throw new ValidateException('该用户已存在商户，不可申请');
+            throw new ValidateException('该用户已存在商户，不可申请');
         }
         // $newUid = Db::name('User')->where('account', $data['phone'])->value('uid', -1);
         // if ($newUid != -1 && $this->userInfo->uid != $newUid) {
@@ -75,8 +75,8 @@ class MerchantIntention extends BaseController
                 'id' => $intention->mer_intention_id
             ]
         ]);
-        $areaInfo  = Db::name('geo_area')->where('area_code', $data['area_id'] ?? '')->find();
-        $cityId = Db::name('geo_city')->where('city_code', $areaInfo['city_code'] ?? '')->value('city_id', 0);
+        $areaInfo = Db::name('geo_area')->where('area_code', $data['area_id'] ?? '')->find();
+        $cityId   = Db::name('geo_city')->where('city_code', $areaInfo['city_code'] ?? '')->value('city_id', 0);
         $streetId = Db::name('geo_street')->where('street_code', $data['street_id'] ?? '')->value('street_id', 0);
         $sendData = [
             'company_name' => $data['mer_name'],