周海龙 / globalso · 提交

转到一个项目

作者 赵彬吉
提交 3da98e6a34d20c5032ef1c8365b4a41ea1288e53 2 个父辈 3994bfe0 7fda7022

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

内嵌 并排对比
正在显示 2 个修改的文件 包含 7 行增加 和 1 行删除
@@ -339,11 +339,18 @@ class CustomModuleContentLogic extends BaseLogic @@ -339,11 +339,18 @@ class CustomModuleContentLogic extends BaseLogic
339 DB::beginTransaction(); 339 DB::beginTransaction();
340 try { 340 try {
341 foreach ($this->param['id'] as $id) { 341 foreach ($this->param['id'] as $id) {
  342 + $info = $this->model->read(['id' => $id], ['id']);
  343 + if($info !== false){
  344 + if($info['status'] != 2){
  345 + $this->model->edit(['status' => 2],['id' => $id]);
  346 + }else{
342 //删除当前扩展字段 347 //删除当前扩展字段
343 $this->delRoute($id); 348 $this->delRoute($id);
344 $this->delContentExtend($id); 349 $this->delContentExtend($id);
345 $this->model->del(['id' => $id]); 350 $this->model->del(['id' => $id]);
346 } 351 }
  352 + }
  353 + }
347 DB::commit(); 354 DB::commit();
348 } catch (Exception $e) { 355 } catch (Exception $e) {
349 DB::rollBack(); 356 DB::rollBack();
@@ -57,7 +57,6 @@ Route::any('get_external_link_by_domain', [\App\Http\Controllers\Api\PrivateCont @@ -57,7 +57,6 @@ Route::any('get_external_link_by_domain', [\App\Http\Controllers\Api\PrivateCont
57 Route::any('get_project_detail', [\App\Http\Controllers\Api\PrivateController::class, 'getProjectByDomain'])->name('api.project_detail'); 57 Route::any('get_project_detail', [\App\Http\Controllers\Api\PrivateController::class, 'getProjectByDomain'])->name('api.project_detail');
58 // 获取项目产品信息 58 // 获取项目产品信息
59 Route::any('get_project_product', [\App\Http\Controllers\Api\PrivateController::class, 'getProjectProduct'])->name('api.project_product'); 59 Route::any('get_project_product', [\App\Http\Controllers\Api\PrivateController::class, 'getProjectProduct'])->name('api.project_product');
60 -// --------------------- 站群服务 ------------------------------------------  
61 // --------------------- 监控服务 ------------------------------------------ 60 // --------------------- 监控服务 ------------------------------------------
62 Route::any('get_project_online', [\App\Http\Controllers\Api\PrivateController::class, 'getProjectOnline'])->name('api.get_project_online'); 61 Route::any('get_project_online', [\App\Http\Controllers\Api\PrivateController::class, 'getProjectOnline'])->name('api.get_project_online');
63 // 将项目标记为广告状态 62 // 将项目标记为广告状态