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

Master server



查看合并请求 !895

@@ -360,7 +360,7 @@ class ProductLogic extends  BaseLogic
                 if($info['status'] == Product::STATUS_RECYCLE){
                 if($info['status'] == Product::STATUS_RECYCLE){
                     $this->delRoute($id);
                     $this->delRoute($id);
                     //删除当前产品模版
                     //删除当前产品模版
-                    $this->delProductModule($id);
+//                    $this->delProductModule($id);
                     $this->model->del(['id'=>$id]);
                     $this->model->del(['id'=>$id]);
                     //删除关联表
                     //删除关联表
                     $cateRelate->del(['product_id'=>$id]);
                     $cateRelate->del(['product_id'=>$id]);
@@ -598,7 +598,8 @@ class ProductLogic extends  BaseLogic
             'source' => BTemplate::SOURCE_PRODUCT,
             'source' => BTemplate::SOURCE_PRODUCT,
             'source_id' => $id,
             'source_id' => $id,
             'project_id'=>$this->user['project_id'],
             'project_id'=>$this->user['project_id'],
-            'is_list'=>0
+            'is_list'=>0,
+            'is_custom'=>0
         ];
         ];
         $bTemplateModel = new BTemplate();
         $bTemplateModel = new BTemplate();
         $rs = $bTemplateModel->del($param);
         $rs = $bTemplateModel->del($param);