gx

@@ -101,29 +101,13 @@ class BlogCategoryController extends BaseController
      * @author :liyuhang
      * @method
      */
-    public function del(Request $request,BlogCategoryModel $blogCategoryModel,BlogModel $blogModel){
+    public function del(Request $request,BlogCategoryLogic $blogCategoryLogic){
         $request->validate([
             'id'=>['required'],
         ],[
             'id.required' => 'ID不能为空',
         ]);
-        foreach ($this->param['id'] as $v){
-            //查询是否有子分类
-            $rs = $blogCategoryModel->read(['pid'=>$v],['id']);
-            if($rs !== false){
-                $this->response('当前分类拥有子分类不允许删除',Code::USER_ERROR);
-            }
-            //查看当前分内下是否有博客
-            $rs = $blogModel->read(['category_id'=>$v],['id']);
-            if($rs !== false){
-                $this->response('当前分类拥有博客',Code::USER_ERROR);
-            }
-        }
-        $this->param['id'] = ['in',$this->param['id']];
-        $rs = BlogCategoryModel->del($this->param);
-        if($rs === false){
-            $this->response('error',Code::USER_ERROR);
-        }
+        $blogCategoryLogic->del_blog_category();
         //TODO::写入操作日志
         $this->response('success');
     }

@@ -60,4 +60,32 @@ class BlogCategoryLogic extends BaseLogic
         DB::commit();
         return $this->success();
     }
+
+    /**
+     * @name :删除博客分类
+     * @return void
+     * @author :liyuhang
+     * @method
+     */
+    public function del_blog_category(){
+        $this->param = $this->requestAll;
+        foreach ($this->param['id'] as $v){
+            //查询是否有子分类
+            $rs = $this->model->read(['pid'=>$v],['id']);
+            if($rs !== false){
+                $this->response('当前分类拥有子分类不允许删除',Code::USER_ERROR);
+            }
+            //查看当前分内下是否有博客
+            $blogModel = new BlogModel();
+            $rs = $blogModel->read(['category_id'=>$v],['id']);
+            if($rs !== false){
+                $this->response('当前分类拥有博客',Code::USER_ERROR);
+            }
+        }
+        $this->param['id'] = ['in',$this->param['id']];
+        $rs = BlogCategoryModel->del($this->param);
+        if($rs === false){
+            $this->response('error',Code::USER_ERROR);
+        }
+    }
 }

@@ -67,20 +67,20 @@ Route::middleware(['bloginauth'])->group(function () {
     //博客相关路由
     Route::prefix('blog')->group(function () {
         //分类
-        Route::any('/category/', [\App\Http\Controllers\Bside\News\NewsCategoryController::class, 'lists'])->name('blog_category_lists');
-        Route::any('/category/add', [\App\Http\Controllers\Bside\News\NewsCategoryController::class, 'add'])->name('blog_category_add');
-        Route::any('/category/info', [\App\Http\Controllers\Bside\News\NewsCategoryController::class, 'info'])->name('blog_category_info');
-        Route::any('/category/edit', [\App\Http\Controllers\Bside\News\NewsCategoryController::class, 'edit'])->name('blog_category_edit');
-        Route::any('/category/del', [\App\Http\Controllers\Bside\News\NewsCategoryController::class, 'del'])->name('blog_category_del');
-        Route::any('/category/status', [\App\Http\Controllers\Bside\News\NewsCategoryController::class, 'status'])->name('blog_category_status');
+        Route::any('/category/', [\App\Http\Controllers\Bside\Blog\BlogCategoryController::class, 'lists'])->name('blog_category_lists');
+        Route::any('/category/add', [\App\Http\Controllers\Bside\Blog\BlogCategoryController::class, 'add'])->name('blog_category_add');
+        Route::any('/category/info', [\App\Http\Controllers\Bside\Blog\BlogCategoryController::class, 'info'])->name('blog_category_info');
+        Route::any('/category/edit', [\App\Http\Controllers\Bside\Blog\BlogCategoryController::class, 'edit'])->name('blog_category_edit');
+        Route::any('/category/del', [\App\Http\Controllers\Bside\Blog\BlogCategoryController::class, 'del'])->name('blog_category_del');
+        Route::any('/category/status', [\App\Http\Controllers\Bside\Blog\BlogCategoryController::class, 'status'])->name('blog_category_status');
 
         //新闻
-        Route::any('/', [\App\Http\Controllers\Bside\News\NewsController::class, 'lists'])->name('blog_lists');
-        Route::any('/add', [\App\Http\Controllers\Bside\News\NewsController::class, 'add'])->name('blog_add');
-        Route::any('/info', [\App\Http\Controllers\Bside\News\NewsController::class, 'info'])->name('blog_info');
-        Route::any('/edit', [\App\Http\Controllers\Bside\News\NewsController::class, 'edit'])->name('blog_edit');
-        Route::any('/del', [\App\Http\Controllers\Bside\News\NewsController::class, 'del'])->name('blog_del');
-        Route::any('/status', [\App\Http\Controllers\Bside\News\NewsController::class, 'status'])->name('blog_status');
+        Route::any('/', [\App\Http\Controllers\Bside\Blog\BlogCategoryController::class, 'lists'])->name('blog_lists');
+        Route::any('/add', [\App\Http\Controllers\Bside\Blog\BlogCategoryController::class, 'add'])->name('blog_add');
+        Route::any('/info', [\App\Http\Controllers\Bside\Blog\BlogCategoryController::class, 'info'])->name('blog_info');
+        Route::any('/edit', [\App\Http\Controllers\Bside\Blog\BlogCategoryController::class, 'edit'])->name('blog_edit');
+        Route::any('/del', [\App\Http\Controllers\Bside\Blog\BlogCategoryController::class, 'del'])->name('blog_del');
+        Route::any('/status', [\App\Http\Controllers\Bside\Blog\BlogCategoryController::class, 'status'])->name('blog_status');
     });
 
     //产品