合并分支 'lyh-server' 到 'master'

变更数据



查看合并请求 !2909

@@ -362,11 +362,11 @@ class TicketUploadDataController extends BaseController
         ]);
         ]);
         ProjectServer::useProject($this->param['project_id']);
         ProjectServer::useProject($this->param['project_id']);
         if($this->param['type'] == 1){//增加产品分类
         if($this->param['type'] == 1){//增加产品分类
-            $data = $this->addProductCategory($this->param['title'],$this->param['project_id']);
+            $data = $this->addProductCategory($this->param['title'],$this->param['project_id'],$this->param['pid'] ?? 0);
         }elseif ($this->param['type'] == 2){//增加blog分类
         }elseif ($this->param['type'] == 2){//增加blog分类
-            $data = $this->addBlogCategory($this->param['title'],$this->param['project_id']);
+            $data = $this->addBlogCategory($this->param['title'],$this->param['project_id'],$this->param['pid'] ?? 0);
         }else{
         }else{
-            $data = $this->addNewsCategory($this->param['title'],$this->param['project_id']);
+            $data = $this->addNewsCategory($this->param['title'],$this->param['project_id'],$this->param['pid'] ?? 0);
         }
         }
         DB::disconnect('custom_mysql');
         DB::disconnect('custom_mysql');
         $this->response('success',Code::SUCCESS, $data);
         $this->response('success',Code::SUCCESS, $data);
@@ -379,13 +379,13 @@ class TicketUploadDataController extends BaseController
      * @method :post
      * @method :post
      * @time   :2025/10/10 10:43
      * @time   :2025/10/10 10:43
      */
      */
-    public function addProductCategory($title,$project_id){
+    public function addProductCategory($title,$project_id,$pid){
         $productCateModel = new Category();
         $productCateModel = new Category();
         $info = $productCateModel->read(['title'=>$title],['id','title']);
         $info = $productCateModel->read(['title'=>$title],['id','title']);
         if($info !== false){
         if($info !== false){
             return $info;
             return $info;
         }else{
         }else{
-            $id = $productCateModel->addReturnId(['title'=>$title,'project_id'=>$project_id]);
+            $id = $productCateModel->addReturnId(['title'=>$title,'project_id'=>$project_id,'pid'=>$pid]);
             $route = RouteMap::setRoute($title,RouteMap::SOURCE_PRODUCT_CATE,$id,$project_id);
             $route = RouteMap::setRoute($title,RouteMap::SOURCE_PRODUCT_CATE,$id,$project_id);
             $productCateModel->edit(['route'=>$route],['id'=>$id]);
             $productCateModel->edit(['route'=>$route],['id'=>$id]);
             return ['id'=>$id,'title'=>$title];
             return ['id'=>$id,'title'=>$title];
@@ -399,13 +399,13 @@ class TicketUploadDataController extends BaseController
      * @method :post
      * @method :post
      * @time   :2025/10/10 10:44
      * @time   :2025/10/10 10:44
      */
      */
-    public function addBlogCategory($title,$project_id){
+    public function addBlogCategory($title,$project_id,$pid){
         $blogCateModel = new BlogCategory();
         $blogCateModel = new BlogCategory();
         $info = $blogCateModel->read(['name'=>$title],['id','name as title']);
         $info = $blogCateModel->read(['name'=>$title],['id','name as title']);
         if($info !== false){
         if($info !== false){
             return $info;
             return $info;
         }else{
         }else{
-            $id = $blogCateModel->addReturnId(['name'=>$title,'project_id'=>$project_id]);
+            $id = $blogCateModel->addReturnId(['name'=>$title,'project_id'=>$project_id,'pid'=>$pid]);
             $route = RouteMap::setRoute($title,RouteMap::SOURCE_BLOG_CATE,$id,$project_id);
             $route = RouteMap::setRoute($title,RouteMap::SOURCE_BLOG_CATE,$id,$project_id);
             $blogCateModel->edit(['alias'=>$route],['id'=>$id]);
             $blogCateModel->edit(['alias'=>$route],['id'=>$id]);
             return ['id'=>$id,'title'=>$title];
             return ['id'=>$id,'title'=>$title];
@@ -419,13 +419,13 @@ class TicketUploadDataController extends BaseController
      * @method :post
      * @method :post
      * @time   :2025/10/10 10:46
      * @time   :2025/10/10 10:46
      */
      */
-    public function addNewsCategory($title,$project_id){
+    public function addNewsCategory($title,$project_id,$pid){
         $newsCateModel = new NewsCategory();//增加新闻分类
         $newsCateModel = new NewsCategory();//增加新闻分类
         $info = $newsCateModel->read(['name'=>$title],['id','name as title']);
         $info = $newsCateModel->read(['name'=>$title],['id','name as title']);
         if($info !== false){
         if($info !== false){
             return $info;
             return $info;
         }else{
         }else{
-            $id = $newsCateModel->addReturnId(['name'=>$title,'project_id'=>$project_id]);
+            $id = $newsCateModel->addReturnId(['name'=>$title,'project_id'=>$project_id,'pid'=>$pid]);
             $route = RouteMap::setRoute($title,RouteMap::SOURCE_NEWS_CATE,$id,$project_id);
             $route = RouteMap::setRoute($title,RouteMap::SOURCE_NEWS_CATE,$id,$project_id);
             $newsCateModel->edit(['alias'=>$route],['id'=>$id]);
             $newsCateModel->edit(['alias'=>$route],['id'=>$id]);
             return ['id'=>$id,'title'=>$title];
             return ['id'=>$id,'title'=>$title];