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

@@ -141,9 +141,8 @@ class ProjectLogic extends BaseLogic
      * @time   :2023/8/30 11:57
      * @time   :2023/8/30 11:57
      */
      */
     public function projectSave(){
     public function projectSave(){
-        DB::beginTransaction();
-        try {
-//            $this->param['project_location'] = 0;//TODO::图片文件存储不同地方，上线后删除
+//        DB::beginTransaction();
+//        try {
             if($this->param['type'] == Project::TYPE_SEVEN){
             if($this->param['type'] == Project::TYPE_SEVEN){
                 //错误单直接返回,单独处理
                 //错误单直接返回,单独处理
                 $this->setTypeSevenEdit($this->param);
                 $this->setTypeSevenEdit($this->param);
@@ -164,11 +163,11 @@ class ProjectLogic extends BaseLogic
                 $this->syncImageFile($this->param['project_location'],$this->param['id']);
                 $this->syncImageFile($this->param['project_location'],$this->param['id']);
                 (new SyncService())->projectAcceptAddress($this->param['id']);
                 (new SyncService())->projectAcceptAddress($this->param['id']);
             }
             }
-            DB::commit();
-        }catch (\Exception $e){
-            DB::rollBack();
-            $this->fail('保存失败，请联系管理员');
-        }
+//            DB::commit();
+//        }catch (\Exception $e){
+//            DB::rollBack();
+//            $this->fail('保存失败，请联系管理员');
+//        }
         return $this->success();
         return $this->success();
     }
     }
 
 

@@ -19,7 +19,6 @@ class NewsLogic extends BaseLogic
     public function __construct()
     public function __construct()
     {
     {
         parent::__construct();
         parent::__construct();
-
         $this->model = new News();
         $this->model = new News();
         $this->param = $this->requestAll;
         $this->param = $this->requestAll;
     }
     }