Merge branch 'master' of http://47.244.231.31:8099/zhl/globalso-v6

@@ -187,7 +187,7 @@ class ExtensionModuleController extends BaseController
                 if($this->user['project_id'] == 2205 && $this->param['module_id'] == 1){
                 if($this->user['project_id'] == 2205 && $this->param['module_id'] == 1){
                     if($v['field_id'] == 12 && !empty($v['value'])){//下拉框数据
                     if($v['field_id'] == 12 && !empty($v['value'])){//下拉框数据
                         if($v['value'] != 'Ordered'){
                         if($v['value'] != 'Ordered'){
-                            $this->fail('请重第一个流程开始选择');
+                            $this->fail('请从第一个流程开始选择。');
                         }
                         }
                     }
                     }
                 }
                 }

@@ -72,9 +72,13 @@ class InquiryForm extends Base
         unset($data['globalso-domain']);
         unset($data['globalso-domain']);
         unset($data['globalso-edition']);
         unset($data['globalso-edition']);
         unset($data['globalso-date']);
         unset($data['globalso-date']);
-        
+
         foreach ($data as $k => $v){
         foreach ($data as $k => $v){
             if(in_array($k, ['name', 'email', 'message']) && empty($v)){
             if(in_array($k, ['name', 'email', 'message']) && empty($v)){
+                //特殊处理1986的表单
+                if($k == 'message' && $data['project_id'] == 1986){
+                    continue;
+                }
                 unset($data[$k]);
                 unset($data[$k]);
             }
             }
         }
         }