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

@@ -5,6 +5,7 @@ namespace App\Http\Controllers\Bside\News;
 use App\Enums\Common\Code;
 use App\Http\Controllers\Bside\BaseController;
 use App\Http\Requests\Bside\News\NewsCategoryRequest;
+use App\Models\News\News as NewsModel;
 use App\Models\News\NewsCategory as NewsCategoryModel;
 use Illuminate\Http\Request;
 
@@ -82,19 +83,29 @@ class NewsCategoryController extends BaseController
      * @author :liyuhang
      * @method
      */
-    public function del(Request $request,NewsCategoryModel $newsCategory){
+    public function del(Request $request,NewsCategoryModel $newsCategory,NewsModel $news){
         $request->validate([
             'id'=>['required'],
         ],[
             'id.required' => 'ID不能为空',
         ]);
-        //查询是否有子分类
-        $id = $newsCategory->read(['pid'=>$this->param['id']],['id']);
-        var_dump($id);
-        die();
-        if($id === false){
-
+        foreach ($this->param['id'] as $k=>$v){
+            //查询是否有子分类
+            $id = $newsCategory->read(['pid'=>$this->param['id']],['id']);
+            if($id !== false){
+                $this->response('当前分类拥有子分类不允许删除',Code::USER_ERROR);
+            }
+            //查看当前分内下是否有商品
+            $news->read(['category_id'=>$this->param['id']],['id']);
+            if($id !== false){
+                $this->response('当前分类拥有商品',Code::USER_ERROR);
+            }
+        }
+        $this->param['id'] = ['in',$id];
+        $rs = $newsCategory->del($this->param);
+        if($rs === false){
+            $this->response('error',Code::USER_ERROR);
         }
-        //查看当前分内下是否有商品
+        $this->response('success');
     }
 }