gx复制项目

@@ -220,7 +220,7 @@ class KeywordController extends BaseController
             'title.max' => '批量操作不能超过500条数据'
             'title.max' => '批量操作不能超过500条数据'
         ]);
         ]);
         $keywordModel = new Keyword();
         $keywordModel = new Keyword();
-        $rs = $keywordModel->edit(['is_video_keyword'=>$this->param['is_video_keyword']],['title'=>['in',$this->param['title']]]);
+        $rs = $keywordModel->edit(['is_video_keyword'=>$this->param['is_video_keyword'] ?? 0],['title'=>['in',$this->param['title']]]);
         if($rs === false){
         if($rs === false){
             $this->fail('编辑失败,请联系管理员');
             $this->fail('编辑失败,请联系管理员');
         }
         }

@@ -127,6 +127,9 @@ class KeywordLogic extends  BaseLogic
         if(!empty($param['related_blog_ids'])){
         if(!empty($param['related_blog_ids'])){
             $param['related_blog_ids'] = Arr::arrToSet($param['related_blog_ids'] ?? []);
             $param['related_blog_ids'] = Arr::arrToSet($param['related_blog_ids'] ?? []);
         }
         }
+        if(!isset($param['is_video_keyword']) || $param['is_video_keyword'] == null){
+            $param['is_video_keyword'] = 0;
+        }
         return $param;
         return $param;
     }
     }
 
 

@@ -436,8 +436,8 @@ class ProductLogic extends  BaseLogic
     public function setCopyProduct(){
     public function setCopyProduct(){
         $info = $this->model->read(['id'=>$this->param['id']]);
         $info = $this->model->read(['id'=>$this->param['id']]);
         $param = $this->setProductParams($info);
         $param = $this->setProductParams($info);
-//        DB::beginTransaction();
-//        try {
+        DB::beginTransaction();
+        try {
             $save_id = $this->model->insertGetId($param);
             $save_id = $this->model->insertGetId($param);
             CategoryRelated::saveRelated($save_id, $info['category_id']);
             CategoryRelated::saveRelated($save_id, $info['category_id']);
             $route = preg_replace('/-product.*/', '', $param['route']);
             $route = preg_replace('/-product.*/', '', $param['route']);
@@ -448,11 +448,11 @@ class ProductLogic extends  BaseLogic
             $this->copyTemplate($this->param['id'],$info['project_id'],$save_id);
             $this->copyTemplate($this->param['id'],$info['project_id'],$save_id);
             //同步扩展字段
             //同步扩展字段
             $this->copyExtendInfo($info['id'],$save_id);
             $this->copyExtendInfo($info['id'],$save_id);
-//            DB::commit();
-//        }catch (\Exception $e){
-//            DB::rollBack();
-//            $this->fail('复制失败,请联系管理员');
-//        }
+            DB::commit();
+        }catch (\Exception $e){
+            DB::rollBack();
+            $this->fail('复制失败,请联系管理员');
+        }
         return $this->success(['id'=>$save_id]);
         return $this->success(['id'=>$save_id]);
     }
     }