gx

@@ -35,8 +35,6 @@ class NavLogic extends  BaseLogic
      */
      */
     public function navSave()
     public function navSave()
     {
     {
-        DB::beginTransaction();
-        try {
         if(!empty($this->param['location'])){
         if(!empty($this->param['location'])){
             if($this->param['location'] == 'header'){
             if($this->param['location'] == 'header'){
                 $this->param['group_id'] = BNavGroup::DEFAULT_HEADER_ID;
                 $this->param['group_id'] = BNavGroup::DEFAULT_HEADER_ID;
@@ -54,11 +52,6 @@ class NavLogic extends  BaseLogic
             $this->param['project_id'] = $this->user['project_id'];
             $this->param['project_id'] = $this->user['project_id'];
             $this->model->add($this->param);
             $this->model->add($this->param);
         }
         }
-            DB::commit();
-        }catch (\Exception $e){
-            DB::rollBack();
-            $this->fail('error');
-        }
         //编辑菜单后,通知更新
         //编辑菜单后,通知更新
         $this->updateNotify(['project_id'=>$this->user['project_id'], 'type'=>RouteMap::SOURCE_NAV, 'route'=>'all']);
         $this->updateNotify(['project_id'=>$this->user['project_id'], 'type'=>RouteMap::SOURCE_NAV, 'route'=>'all']);
         return $this->success();
         return $this->success();

@@ -35,6 +35,7 @@ class NavRequest extends FormRequest
 //            'group_id'   =>  ['required','integer'],
 //            'group_id'   =>  ['required','integer'],
             'pid'   =>  ['required','integer'],
             'pid'   =>  ['required','integer'],
             'name'   =>  ['required','max:100'],
             'name'   =>  ['required','max:100'],
+            'url'   =>  ['required'],
         ];
         ];
         return $rule;
         return $rule;
     }
     }
@@ -49,6 +50,7 @@ class NavRequest extends FormRequest
             'pid.integer'  =>  '上级选择错误',
             'pid.integer'  =>  '上级选择错误',
             'name.required'  =>  '名称必须',
             'name.required'  =>  '名称必须',
             'name.max'  =>  '名称不能超过100个字符',
             'name.max'  =>  '名称不能超过100个字符',
+            'url.required'  =>  '链接不能为空',
         ];
         ];
     }
     }
 }
 }

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