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

@@ -93,8 +93,8 @@ class ProjectLogic extends BaseLogic
      * @time   :2023/8/30 11:57
      */
     public function projectSave(){
-//        DB::beginTransaction();
-//        try {
+        DB::beginTransaction();
+        try {
             if($this->param['type'] == Project::TYPE_SEVEN){
                 //错误单直接返回,单独处理
                 $this->setTypeSevenEdit($this->param);
@@ -114,11 +114,11 @@ class ProjectLogic extends BaseLogic
                 //创建站点
                 $this->createSite($this->param);
             }
-//            DB::commit();
-//        }catch (\Exception $e){
-//            DB::rollBack();
-//            $this->fail('请填写完整后再提交');
-//        }
+            DB::commit();
+        }catch (\Exception $e){
+            DB::rollBack();
+            $this->fail('请填写完整后再提交');
+        }
         return $this->success();
     }
 
@@ -142,13 +142,17 @@ class ProjectLogic extends BaseLogic
         }
         if(isset($param['notice_file']) && !empty($param['notice_file'])){
             foreach ($param['notice_file'] as &$v1) {
-                $v1['url'] = str_replace_url($v1['url']);
+                if(isset($v1['url']) && !empty($v1['url'])){
+                    $v1['url'] = str_replace_url($v1['url']);
+                }
             }
             $param['notice_file'] = Arr::a2s($param['notice_file']);
         }
         if(isset($param['confirm_file']) && !empty($param['confirm_file'])){
             foreach ($param['confirm_file'] as &$v2) {
-                $v2['url'] = str_replace_url($v2['url']);
+                if(isset($v2['url']) && !empty($v2['url'])){
+                    $v2['url'] = str_replace_url($v2['url']);
+                }
             }
             $param['confirm_file'] = Arr::a2s($param['confirm_file']);
         }