合并分支 'zhl' 到 'master'

Zhl



查看合并请求 !25

@@ -21,7 +21,8 @@ class SyncService extends BaseService
 {
     /**
      * 同步信息到表单系统
-     * TODO 项目已经上线 && 已经有正式域名 && 用户设置收件邮箱或者手机号码
+     * TODO 已经有正式域名
+     * 项目已经上线 && 已经有正式域名 && 用户设置收件邮箱或者手机号码
      * @param int $project_id
      * @return mixed
      */
@@ -32,18 +33,17 @@ class SyncService extends BaseService
             // 项目信息
             $project = Project::with('deploy_build')->with('deploy_optimize')->where(['id'=>$project_id])->first();
 
-            // 收件设置信息
-            ProjectServer::useProject($project_id);
-            $receive = WebSettingReceiving::where(['project_id' => $project_id])->get();
-
             // 不满足条件 不同步到表单系统
-            if (FALSE == in_array($project->type, [Project::TYPE_TWO, Project::TYPE_THREE]) || empty($project->deploy_optimize->domain) || $receive->isEmpty()) {
+            if (empty($project->deploy_optimize->domain)) {
                 return false;
             }
 
             // 生产域名
             $domain = (new DomainInfo())->getDomain($project->deploy_optimize->domain);
 
+            // 收件设置信息
+            ProjectServer::useProject($project_id);
+            $receive = WebSettingReceiving::where(['project_id' => $project_id])->get();
             // 处理收件信息
             $email = $phone = [];
             foreach ($receive as $value) {