gx

@@ -92,30 +92,32 @@ class ProjectController extends BaseController
     }
 
     /**
-     * @remark :搜索升级项目
-     * @name   :searchUpgrade
-     * @author :lyh
-     * @method :post
-     * @time   :2023/11/6 16:27
-     */
-    public function searchUpgrade(&$query){
-        if(isset($this->map['is_upgrade']) && !empty($this->map['is_upgrade'])){
-            $query->where('gl_project.is_upgrade', $this->map['is_upgrade']);
-        }
-        return $query;
-    }
-
-    /**
      * 搜索项目状态
      * @param $query
      * @return mixed
      */
     public function searchType(&$query){
+        if(isset($this->map['type']) && !empty($this->map['type'])){
             if (in_array($this->map['type'], [Project::TYPE_ZERO, Project::TYPE_ONE, Project::TYPE_TWO, Project::TYPE_THREE]))
                 $query->where('gl_project.type', $this->map['type']);
             else{
                 $query->whereIn('gl_project.type', [Project::TYPE_FOUR,Project::TYPE_SIX]);
             }
+        }
+        return $query;
+    }
+
+    /**
+     * @remark :搜索升级项目
+     * @name   :searchUpgrade
+     * @author :lyh
+     * @method :post
+     * @time   :2023/11/6 16:27
+     */
+    public function searchUpgrade(&$query){
+        if(isset($this->map['is_upgrade']) && !empty($this->map['is_upgrade'])){
+            $query->where('gl_project.is_upgrade', $this->map['is_upgrade']);
+        }
         return $query;
     }
 

@@ -62,6 +62,8 @@ class NewsLogic extends BaseLogic
         DB::beginTransaction();
         try {
             $this->param = $this->paramProcessing($this->param);
+            //路由映射
+            $this->param['url'] = $this->param['url'].'-'.RouteMap::SOURCE_NEWS;
             if (isset($this->param['id']) && !empty($this->param['id'])) {
                 //是否更新路由
                 $id = $this->editNewsRoute($this->param['id'], $this->param['url']);

@@ -112,6 +112,8 @@ class CategoryLogic extends  BaseLogic
     public function categorySave(){
         DB::beginTransaction();
         try {
+            //路由映射
+            $this->param['route'] = $this->param['route'].'-'.RouteMap::SOURCE_PRODUCT_CATE;
             if(isset($this->param['id']) && !empty($this->param['id'])){
                 //是否编辑路由
                 $id = $this->editCategoryRoute($this->param['id'],$this->param['route']);
@@ -123,7 +125,6 @@ class CategoryLogic extends  BaseLogic
                 //处理子集
                 $this->addProcessingSon($id);
             }
-            //路由映射
             $route = RouteMap::setRoute($this->param['route'], RouteMap::SOURCE_PRODUCT_CATE, $id, $this->user['project_id']);
             $this->edit(['route'=>$route],['id'=>$id]);
             //清除缓存

@@ -37,11 +37,12 @@ class ProductLogic extends  BaseLogic
      * @time   :2023/8/21 18:35
      */
     public function productSave(){
-//        $category_ids = $this->param['category_id'] ?? [];
         //参数处理
         $this->param = $this->handleSaveParam($this->param);
-//        DB::connection('custom_mysql')->beginTransaction();
-//        try {
+        DB::connection('custom_mysql')->beginTransaction();
+        try {
+            //路由映射
+            $this->param['route'] = $this->param['route'].'-'.RouteMap::SOURCE_PRODUCT;
             if(isset($this->param['id']) && !empty($this->param['id'])){
                 //查看路由是否更新
                 $id = $this->editProductRoute($this->param['id'],$this->param['route']);
@@ -52,16 +53,15 @@ class ProductLogic extends  BaseLogic
                 $this->param['updated_at'] = $this->param['created_at'];
                 $id = $this->model->addReturnId($this->param);
             }
-            //路由映射
             $route = RouteMap::setRoute($this->param['route'], RouteMap::SOURCE_PRODUCT, $id, $this->user['project_id']);
             $this->model->edit(['route'=>$route],['id'=>$id]);
             //产品分类关联
 //            CategoryRelated::saveRelated($id, $category_ids);
-//            DB::connection('custom_mysql')->commit();
-//        }catch (\Exception $e){
-//            DB::connection('custom_mysql')->rollBack();
-//            $this->fail('系统错误请联系管理员');
-//        }
+            DB::connection('custom_mysql')->commit();
+        }catch (\Exception $e){
+            DB::connection('custom_mysql')->rollBack();
+            $this->fail('系统错误请联系管理员');
+        }
         //通知更新
         $this->updateNotify(['project_id'=>$this->user['project_id'], 'type'=>RouteMap::SOURCE_PRODUCT, 'route'=>$route]);
         return $this->success();