合并分支：更新

app/admin/controller/merchant/system/merchant/MerchantIntention.php

@@ -89,13 +89,14 @@ class MerchantIntention extends BaseController
     public function SwitchStatus()
     {
         $params = get_params(['status','fail_msg','create_mer','id']);
+        $params['status'] = $params['status'] == 1 ? 1 : 2;
         $id = $params['id'];
         
         //创建
         if (!$this->intention->GetWhereCount(['mer_intention_id' => $id, 'is_del' => 0]))
             return to_assign(1,'数据不存在');
+
         try {
-            $params['status'] = $params['status'] == 1 ? 1 : 2;
             $this->intention->updateStatus($id, $params);
         }catch(ValidateException $e){
             return to_assign(1, $e->getError());