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

gx脚本更新路由



查看合并请求 !975

@@ -550,7 +550,7 @@ class ProductLogic extends  BaseLogic
     public function copyColumn($product_id,$new_product_id){
     public function copyColumn($product_id,$new_product_id){
         $columnModel = new Column();
         $columnModel = new Column();
         $columnList = $columnModel->list(['product_id'=>$product_id]);
         $columnList = $columnModel->list(['product_id'=>$product_id]);
-        if(!empty($columnInfo)){
+        if(!empty($columnList)){
             $data = [];
             $data = [];
             foreach ($columnList as $k => $v){
             foreach ($columnList as $k => $v){
                 unset($v['id']);
                 unset($v['id']);
@@ -573,7 +573,7 @@ class ProductLogic extends  BaseLogic
     public function copyDetail($product_id,$new_product_id){
     public function copyDetail($product_id,$new_product_id){
         $detailModel = new Detail();
         $detailModel = new Detail();
         $detailList = $detailModel->list(['product_id'=>$product_id]);
         $detailList = $detailModel->list(['product_id'=>$product_id]);
-        if(!empty($columnInfo)){
+        if(!empty($detailList)){
             $data = [];
             $data = [];
             foreach ($detailList as $k => $v){
             foreach ($detailList as $k => $v){
                 unset($v['id']);
                 unset($v['id']);