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

@@ -173,8 +173,7 @@ class ServerConfigLogic extends BaseLogic
     public function updateAllTable($param){
     public function updateAllTable($param){
         DevopsTask::addTask($param['sql']);
         DevopsTask::addTask($param['sql']);
         //执行命令行
         //执行命令行
-        $process = new Process(['php', 'artisan', 'devops_task']);
-        $process->start();
+        Artisan::call('php artisan devops_task');
         return $this->success();
         return $this->success();
     }
     }
 }
 }

@@ -259,6 +259,9 @@ class ProjectLogic extends BaseLogic
      * @time   :2023/9/12 11:20
      * @time   :2023/9/12 11:20
      */
      */
     public function setTypeSevenEdit($param){
     public function setTypeSevenEdit($param){
+        $info = $this->model->read(['id'=>$param['id']]);
+
+        if($info['delete_status'] == 0){
             //删除原始项目
             //删除原始项目
             $this->edit(['delete_status' => 1], ['id' => $param['id']]);
             $this->edit(['delete_status' => 1], ['id' => $param['id']]);
 
 
@@ -281,6 +284,7 @@ class ProjectLogic extends BaseLogic
             ];
             ];
             $renewModel = new ProjectRenew();
             $renewModel = new ProjectRenew();
             $renewModel->add($data);
             $renewModel->add($data);
+        }
 
 
         return $this->success();
         return $this->success();
     }
     }