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

Master server



查看合并请求 !1317

@@ -90,7 +90,6 @@ class LyhImportTest extends Command
             if($k < 2){
             if($k < 2){
                 continue;
                 continue;
             }
             }
-            dd($val);
             $saveData = [];
             $saveData = [];
             if($val[1] ?? ''){
             if($val[1] ?? ''){
                 $saveData['title'] = $val[1];
                 $saveData['title'] = $val[1];
@@ -134,18 +133,23 @@ class LyhImportTest extends Command
                 'product_id'=>$id
                 'product_id'=>$id
             ];
             ];
             $faqId = $columnModel->addReturnId($detailFaq);
             $faqId = $columnModel->addReturnId($detailFaq);
+
             $faqsDetail = json_decode($val[4],true);
             $faqsDetail = json_decode($val[4],true);
             $faqContent = '';
             $faqContent = '';
-            foreach ($faqsDetail as $faq_Val){
-                $faqContent = "question:".$faq_Val['question'] . "<br />" . "answer:".$faq_Val['answer']. "<br />";
+            if(!empty($faqsDetail) && is_array($faqsDetail)){
+                foreach ($faqsDetail as $faq_Val){
+                    $faqContent .= "question:".$faq_Val['question'] . "<br />" . "answer:".$faq_Val['answer']. "<br />";
+                }
+                $detailFaqInfo = [
+                    'product_id'=>$id,
+                    'column_id'=>$faqId,
+                    'text_type'=>1,
+                    'content'=>json_encode(['content'=>$faqContent])
+                ];
+                $detailModel->addReturnId($detailFaqInfo);
+            }else{
+                echo date('Y-m-d H:i:s') . '产品标题：'. $val[1] . PHP_EOL .'faqs数据有问题：' . $val[4];
             }
             }
-            $detailFaqInfo = [
-                'product_id'=>$id,
-                'column_id'=>$faqId,
-                'text_type'=>1,
-                'content'=>json_encode(['content'=>$faqContent])
-            ];
-            $detailModel->addReturnId($detailFaqInfo);
         }
         }
         return true;
         return true;
     }
     }