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

@@ -85,6 +85,7 @@ class KeywordController extends BaseController
         }
         $map['route'] = ['<>',''];
         $map['project_id'] = $this->user['project_id'];
+        $map['deleted_at'] = null;
         return $this->success($map);
     }
 

@@ -31,7 +31,8 @@ class ExtensionModuleLogic extends BaseLogic
      * @time   :2024/8/7 15:50
      */
     public function saveExtensionModule(){
-        ProjectServer::useProject($this->map['project_id']);
+        ProjectServer::useProject($this->param['project_id']);
+        unset($this->param['project_id']);
         $this->model = new ExtensionModule();
         //查看数据是否存在
         if(isset($this->param['id']) && !empty($this->param['id'])){
@@ -61,7 +62,8 @@ class ExtensionModuleLogic extends BaseLogic
      * @time   :2024/8/7 16:07
      */
     public function delExtensionModule(){
-        ProjectServer::useProject($this->map['project_id']);
+        ProjectServer::useProject($this->param['project_id']);
+        unset($this->param['project_id']);
         $moduleFiledModel = new ExtensionModuleField();
         $info = $moduleFiledModel->read(['module_id'=>$this->param['id']]);
         if($info !== false){

@@ -215,7 +215,6 @@ class ProductLogic extends  BaseLogic
         try {
             if(isset($this->param['route']) && !empty($this->param['route'])){
                 $this->param['route'] = RouteMap::setRoute($this->param['route'], RouteMap::SOURCE_PRODUCT, $this->param['id'], $this->user['project_id']);
-//                $this->editProductRoute($this->param['id'],$this->param['route']);
             }
             $this->model->edit($this->param,['id'=>$this->param['id']]);
             //产品分类关联