diff --git a/app/Admin/Controllers/AdminNoticeController.php b/app/Admin/Controllers/AdminNoticeController.php index 62336be..757ac68 100644 --- a/app/Admin/Controllers/AdminNoticeController.php +++ b/app/Admin/Controllers/AdminNoticeController.php @@ -27,7 +27,7 @@ class AdminNoticeController extends AdminController ])) ->quickSaveItemApi(admin_url('quick-edit/admin-notices/$id')) ->columns([ - TableColumn::make()->name('id')->label(__('admin-notice.id'))->sortable(true), + TableColumn::make()->name('id')->label(__('admin-notice.id')), TableColumn::make()->name('title')->label(__('admin-notice.title')), TableColumn::make()->name('article.title')->label(__('admin-notice.article_id')), TableColumn::make()->name('is_enable')->type('switch')->label(__('admin-notice.is_enable'))->quickEdit(SwitchControl::make()->saveImmediately(true)->mode('inline')), diff --git a/app/Services/Admin/ArticleService.php b/app/Services/Admin/ArticleService.php index 306faf6..0c63706 100644 --- a/app/Services/Admin/ArticleService.php +++ b/app/Services/Admin/ArticleService.php @@ -2,7 +2,7 @@ namespace App\Services\Admin; -use App\Models\{Article, ArticleCategory}; +use App\Models\{Article, ArticleCategory, AdminNotice}; use App\Filters\ArticleFilter; /** @@ -51,4 +51,12 @@ class ArticleService extends BaseService } return parent::store($data); } + + public function delete(string $ids): mixed + { + $id = explode(',', $ids); + // 解除关联的公告 + AdminNotice::whereIn('article_id', $id)->update(['article_id' => null]); + return $this->query()->whereIn($this->primaryKey(), explode(',', $ids))->delete(); + } }