gx

@@ -29,6 +29,7 @@ class CustomModuleCategoryController extends BaseController
             'module_id.required' => 'module_id不能为空',
             'module_id.required' => 'module_id不能为空',
         ]);
         ]);
         $this->map['project_id'] = $this->user['project_id'];
         $this->map['project_id'] = $this->user['project_id'];
+        $this->map['status'] = 0;
         $lists = $customModuleCategory->lists($this->map,$this->page,$this->row,$this->order);
         $lists = $customModuleCategory->lists($this->map,$this->page,$this->row,$this->order);
         $this->response('success',Code::SUCCESS,$lists);
         $this->response('success',Code::SUCCESS,$lists);
     }
     }
@@ -73,11 +74,13 @@ class CustomModuleCategoryController extends BaseController
         $this->request->validate([
         $this->request->validate([
             'name'=>['required'],
             'name'=>['required'],
             'route'=>['required'],
             'route'=>['required'],
-            'module_id'=>['required']
+            'module_id'=>['required'],
+            'pid'=>['required']
         ],[
         ],[
             'name.required' => '分类名称不能为空',
             'name.required' => '分类名称不能为空',
             'route.required' => '分类路由不能为空',
             'route.required' => '分类路由不能为空',
-            'module_id.required' => '所选模块id不能为空'
+            'module_id.required' => '所选模块id不能为空',
+            'pid.required' => '上级不能为空'
         ]);
         ]);
         $logic->categorySave();
         $logic->categorySave();
         $this->response('success');
         $this->response('success');

@@ -32,6 +32,7 @@ class CustomModuleController extends BaseController
      */
      */
     public function lists(CustomModule $customModule){
     public function lists(CustomModule $customModule){
         $this->map['project_id'] = $this->user['project_id'];
         $this->map['project_id'] = $this->user['project_id'];
+        $this->map['status'] = 0;
         $lists = $customModule->lists($this->map,$this->page,$this->row,$this->order);
         $lists = $customModule->lists($this->map,$this->page,$this->row,$this->order);
         $this->response('success',Code::SUCCESS,$lists);
         $this->response('success',Code::SUCCESS,$lists);
     }
     }

@@ -268,14 +268,37 @@ class CustomModuleCategoryLogic extends BaseLogic
      * @time   :2023/12/4 15:47
      * @time   :2023/12/4 15:47
      */
      */
     public function categoryDel(){
     public function categoryDel(){
-        $info = $this->model->read(['pid' => $this->param['id']], ['id', 'route']);
-        if($info === false){
-            $this->fail('当前分类拥有下级');
-        }
-        $rs = $this->model->del($this->param);
-        if($rs === false){
-            $this->fail('系统错误，请连续管理员');
+        $ids = $this->param['id'];
+        foreach ($ids as $id){
+            $info = $this->model->read(['pid'=>$id],['id']);
+            if($info !== false){
+                $this->fail('分类id：'.$id.'拥有子集不允许删除');
+            }
+            $contentModel = new CustomModuleContent();
+            $contentInfo = $contentModel->read(['category_id'=>['like','%,'.$id.',%']]);
+            if($contentInfo !== false){
+                $this->fail('当前分类拥有产品不允许删除');
+            }
+            //删除路由
+            $this->delRoute($id);
+            $this->model->del(['id'=>$id]);
         }
         }
         return $this->success();
         return $this->success();
     }
     }
+
+    /**
+     * @remark :删除路由
+     * @name   :delRoute
+     * @author :lyh
+     * @method :post
+     * @time   :2023/9/7 10:50
+     */
+    public function delRoute($id)
+    {
+        RouteMap::delRoute(RouteMap::SOURCE_MODULE_CATE.$this->param['module_id'], $id, $this->user['project_id']);
+        //通知
+        $info = $this->model->read(['id' => $id], ['id', 'route']);
+        $this->curlDelRoute(['route'=>$info['route']]);
+        return $this->success();
+    }
 }
 }